Problems wih diff merger git on Intellij IDEA

Answered

2016-10-04 15:24:12,007 [2309026] ERROR - it4idea.merge.GitMergeProvider - IntelliJ IDEA 2016.2.2 Build #IC-162.1628.40
2016-10-04 15:24:12,007 [2309026] ERROR - it4idea.merge.GitMergeProvider - JDK: 1.8.0_102
2016-10-04 15:24:12,007 [2309026] ERROR - it4idea.merge.GitMergeProvider - VM: Java HotSpot(TM) 64-Bit Server VM
2016-10-04 15:24:12,007 [2309026] ERROR - it4idea.merge.GitMergeProvider - Vendor: Oracle Corporation
2016-10-04 15:24:12,007 [2309026] ERROR - it4idea.merge.GitMergeProvider - OS: Windows 7
2016-10-04 15:24:12,007 [2309026] ERROR - it4idea.merge.GitMergeProvider - Last Action: Git.ResolveConflicts
2016-10-04 15:24:12,008 [2309027] ERROR - llij.ide.plugins.PluginManager - null
java.lang.NullPointerException
at git4idea.merge.GitMergeProvider$MyMergeSession.<init>(GitMergeProvider.java:300)
at git4idea.merge.GitMergeProvider.createMergeSession(GitMergeProvider.java:231)
at com.intellij.openapi.vcs.merge.MultipleFileMergeDialog.<init>(MultipleFileMergeDialog.java:152)
at com.intellij.openapi.vcs.impl.AbstractVcsHelperImpl.showMergeDialog(AbstractVcsHelperImpl.java:604)
at com.intellij.openapi.vcs.AbstractVcsHelper.showMergeDialog(AbstractVcsHelper.java:128)
at git4idea.actions.GitResolveConflictsAction.actionPerformed(GitResolveConflictsAction.java:76)
at com.intellij.openapi.actionSystem.ex.ActionUtil$1.run(ActionUtil.java:197)
at com.intellij.openapi.application.TransactionGuardImpl.runSyncTransaction(TransactionGuardImpl.java:88)
at com.intellij.openapi.application.TransactionGuardImpl.submitTransactionAndWait(TransactionGuardImpl.java:156)
at com.intellij.openapi.actionSystem.ex.ActionUtil.performActionDumbAware(ActionUtil.java:211)
at com.intellij.openapi.actionSystem.impl.ActionMenuItem$ActionTransmitter.lambda$actionPerformed$2(ActionMenuItem.java:304)
at com.intellij.openapi.wm.impl.FocusManagerImpl.runOnOwnContext(FocusManagerImpl.java:905)
at com.intellij.openapi.wm.impl.IdeFocusManagerImpl.runOnOwnContext(IdeFocusManagerImpl.java:124)
at com.intellij.openapi.actionSystem.impl.ActionMenuItem$ActionTransmitter.actionPerformed(ActionMenuItem.java:284)
at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2022)
at com.intellij.openapi.actionSystem.impl.ActionMenuItem.lambda$fireActionPerformed$0(ActionMenuItem.java:112)
at com.intellij.openapi.application.TransactionGuardImpl.runSyncTransaction(TransactionGuardImpl.java:88)
at com.intellij.openapi.application.TransactionGuardImpl.access$300(TransactionGuardImpl.java:40)
at com.intellij.openapi.application.TransactionGuardImpl$2.run(TransactionGuardImpl.java:113)
at com.intellij.openapi.application.TransactionGuardImpl.submitTransaction(TransactionGuardImpl.java:123)
at com.intellij.openapi.application.TransactionGuard.submitTransaction(TransactionGuard.java:109)
at com.intellij.openapi.actionSystem.impl.ActionMenuItem.fireActionPerformed(ActionMenuItem.java:112)
at com.intellij.ui.plaf.beg.BegMenuItemUI.doClick(BegMenuItemUI.java:513)
at com.intellij.ui.plaf.beg.BegMenuItemUI.access$300(BegMenuItemUI.java:45)
at com.intellij.ui.plaf.beg.BegMenuItemUI$MyMouseInputHandler.mouseReleased(BegMenuItemUI.java:533)
at java.awt.Component.processMouseEvent(Component.java:6533)
at javax.swing.JComponent.processMouseEvent(JComponent.java:3324)
at java.awt.Component.processEvent(Component.java:6298)
at java.awt.Container.processEvent(Container.java:2236)
at java.awt.Component.dispatchEventImpl(Component.java:4889)
at java.awt.Container.dispatchEventImpl(Container.java:2294)
at java.awt.Component.dispatchEvent(Component.java:4711)
at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4888)
at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4525)
at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4466)
at java.awt.Container.dispatchEventImpl(Container.java:2280)
at java.awt.Window.dispatchEventImpl(Window.java:2746)
at java.awt.Component.dispatchEvent(Component.java:4711)
at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:758)
at java.awt.EventQueue.access$500(EventQueue.java:97)
at java.awt.EventQueue$3.run(EventQueue.java:709)
at java.awt.EventQueue$3.run(EventQueue.java:703)
at java.security.AccessController.doPrivileged(Native Method)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:76)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:86)
at java.awt.EventQueue$4.run(EventQueue.java:731)
at java.awt.EventQueue$4.run(EventQueue.java:729)
at java.security.AccessController.doPrivileged(Native Method)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:76)
at java.awt.EventQueue.dispatchEvent(EventQueue.java:728)
at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:863)
at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:695)
at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:385)
at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:201)
at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116)
at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:105)
at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93)
at java.awt.EventDispatchThread.run(EventDispatchThread.java:82)
2016-10-04 15:24:12,008 [2309027] ERROR - llij.ide.plugins.PluginManager - IntelliJ IDEA 2016.2.2 Build #IC-162.1628.40
2016-10-04 15:24:12,008 [2309027] ERROR - llij.ide.plugins.PluginManager - JDK: 1.8.0_102
2016-10-04 15:24:12,008 [2309027] ERROR - llij.ide.plugins.PluginManager - VM: Java HotSpot(TM) 64-Bit Server VM
2016-10-04 15:24:12,008 [2309027] ERROR - llij.ide.plugins.PluginManager - Vendor: Oracle Corporation
2016-10-04 15:24:12,008 [2309027] ERROR - llij.ide.plugins.PluginManager - OS: Windows 7
2016-10-04 15:24:12,009 [2309028] ERROR - llij.ide.plugins.PluginManager - Last Action: Git.ResolveConflicts

Please sign in to leave a comment.