make some change in file, commit (to HEAD) invoke MergeWithBranch for this file and try to branch (the correct file in branch is shown as target branch in dialog) – exception Error during dispatching of java.awt.event.MouseEvent[MOUSE_RELEASED,(78,93),absolute(606,642),button=1,modifiers=Button1,clickCount=1] on ###overrideRedirect### java.lang.NullPointerException at org.jetbrains.tfsIntegration.core.MergeHelper.execute(MergeHelper.java:41) at org.jetbrains.tfsIntegration.actions.MergeBranchAction.execute(MergeBranchAction.java:69) at org.jetbrains.tfsIntegration.actions.SingleItemAction.actionPerformed(SingleItemAction.java:49) at com.intellij.openapi.actionSystem.impl.ActionMenuItem$ActionTransmitter.actionPerformed(ActionMenuItem.java:12) at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:1995) at com.intellij.openapi.actionSystem.impl.ActionMenuItem.fireActionPerformed(ActionMenuItem.java:27) at com.intellij.ui.plaf.beg.BegMenuItemUI.a(BegMenuItemUI.java:96) at com.intellij.ui.plaf.beg.BegMenuItemUI.access$300(BegMenuItemUI.java:222) at com.intellij.ui.plaf.beg.BegMenuItemUI$MyMouseInputHandler.mouseReleased(BegMenuItemUI.java:1) at java.awt.Component.processMouseEvent(Component.java:6041) at javax.swing.JComponent.processMouseEvent(JComponent.java:3265) at java.awt.Component.processEvent(Component.java:5806) at java.awt.Container.processEvent(Container.java:2058) at java.awt.Component.dispatchEventImpl(Component.java:4413) at java.awt.Container.dispatchEventImpl(Container.java:2116) at java.awt.Component.dispatchEvent(Component.java:4243) at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4322) at java.awt.LightweightDispatcher.processMouseEvent(Container.java:3986) at java.awt.LightweightDispatcher.dispatchEvent(Container.java:3916) at java.awt.Container.dispatchEventImpl(Container.java:2102) at java.awt.Window.dispatchEventImpl(Window.java:2440) at java.awt.Component.dispatchEvent(Component.java:4243) at java.awt.EventQueue.dispatchEvent(EventQueue.java:599) at com.intellij.ide.IdeEventQueue.c(IdeEventQueue.java:42) at com.intellij.ide.IdeEventQueue.b(IdeEventQueue.java:58) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:213) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:273) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:183) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:173) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:168) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:160) at java.awt.EventDispatchThread.run(EventDispatchThread.java:121)