java.lang.NullPointerException
   at org.netbeans.libs.git.jgit.commands.AddCommand.run(AddCommand.java:117)
   at org.netbeans.libs.git.jgit.commands.GitCommand.execute(GitCommand.java:72)
   at org.netbeans.libs.git.GitClient.add(GitClient.java:220)
   at org.netbeans.modules.git.client.GitClient$1.call(GitClient.java:209)
   at org.netbeans.modules.git.client.GitClient$1.call(GitClient.java:205)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker$1.call(GitClient.java:742)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.runMethodIntern(GitClient.java:769)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.runMethod(GitClient.java:705)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.access$200(GitClient.java:684)
   at org.netbeans.modules.git.client.GitClient.add(GitClient.java:205)
   at org.netbeans.modules.git.ui.conflicts.MarkResolvedAction$1.perform(MarkResolvedAction.java:100)
   at org.netbeans.modules.git.client.GitProgressSupport.performIntern(GitProgressSupport.java:101)
   at org.netbeans.modules.git.client.GitProgressSupport.run(GitProgressSupport.java:94)
   at org.openide.util.RequestProcessor$Task.run(RequestProcessor.java:1404)
   at org.openide.util.RequestProcessor$Processor.run(RequestProcessor.java:1984)
Caused: org.openide.util.RequestProcessor$SlowItem: task failed due to: java.lang.NullPointerException
   at org.openide.util.RequestProcessor.post(RequestProcessor.java:421)
   at org.netbeans.modules.git.client.GitProgressSupport.start(GitProgressSupport.java:87)
   at org.netbeans.modules.git.ui.conflicts.MarkResolvedAction.performAction(MarkResolvedAction.java:117)
   at org.netbeans.modules.git.ui.actions.SingleRepositoryAction.performAction(SingleRepositoryAction.java:89)
   at org.netbeans.modules.git.ui.conflicts.ResolveConflictsExecutor$MergeResultWriterInfo.repairEntries(ResolveConflictsExecutor.java:541)
   at org.netbeans.modules.git.ui.conflicts.ResolveConflictsExecutor$MergeResultWriterInfo.close(ResolveConflictsExecutor.java:535)
   at org.netbeans.modules.merge.builtin.visualizer.MergeControl.vetoableChange(MergeControl.java:380)
   at org.openide.util.WeakListenerImpl$VetoableChange.vetoableChange(WeakListenerImpl.java:228)
   at java.beans.VetoableChangeSupport.fireVetoableChange(VetoableChangeSupport.java:0)
   at java.beans.VetoableChangeSupport.fireVetoableChange(VetoableChangeSupport.java:0)
   at javax.swing.JComponent.fireVetoableChange(JComponent.java:0)
   at org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent.okButtonActionPerformed(MergeDialogComponent.java:277)
   at org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent.access$100(MergeDialogComponent.java:88)
   at org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent$FormListener.actionPerformed(MergeDialogComponent.java:181)
   at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:0)
   at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:0)
   at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:0)
   at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:0)
   at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:0)
   at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:0)
   at java.awt.Component.processMouseEvent(Component.java:0)
   at javax.swing.JComponent.processMouseEvent(JComponent.java:0)
   at java.awt.Component.processEvent(Component.java:0)
   at java.awt.Container.processEvent(Container.java:0)
   at java.awt.Component.dispatchEventImpl(Component.java:0)
   at java.awt.Container.dispatchEventImpl(Container.java:0)
   at java.awt.Component.dispatchEvent(Component.java:0)
   at java.awt.LightweightDispatcher.retargetMouseEvent(LightweightDispatcher.java:0)
   at java.awt.LightweightDispatcher.processMouseEvent(LightweightDispatcher.java:0)
   at java.awt.LightweightDispatcher.dispatchEvent(LightweightDispatcher.java:0)
   at java.awt.Container.dispatchEventImpl(Container.java:0)
   at java.awt.Window.dispatchEventImpl(Window.java:0)
   at java.awt.Component.dispatchEvent(Component.java:0)
   at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:0)
   at java.awt.EventQueue.access$000(EventQueue.java:0)
   at java.awt.EventQueue$1.run(EventQueue.java:0)
   at java.awt.EventQueue$1.run(EventQueue.java:0)
   at java.security.AccessController.doPrivileged(AccessController.java:0)
   at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:0)
   at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:0)
   at java.awt.EventQueue$2.run(EventQueue.java:0)
   at java.awt.EventQueue$2.run(EventQueue.java:0)
   at java.security.AccessController.doPrivileged(AccessController.java:0)
   at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:0)
   at java.awt.EventQueue.dispatchEvent(EventQueue.java:0)
   at org.netbeans.core.TimableEventQueue.dispatchEvent(TimableEventQueue.java:162)
   at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:0)
   at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:0)
   at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:0)
   at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:0)
   at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:0)
   at java.awt.EventDispatchThread.run(EventDispatchThread.java:0)