Merge resolve not working

Answered
Avatar
Elavarasuakhash
Created

The merge conflict resolution is not working. No merge resolution popup appears, auto-resolve does not work, and even clicking the Resolve button in the commit area does nothing.

This issue occurs only in 2026.2.0.1. The 2026.2.1 Preview build works fine, and all older versions also work as expected.

Votes

0

Share

4 comments
Avatar
Dina Zadoorian
Created

Hi there, thanks for reaching out. We were not able to reproduce the issue in 2026.2.0.1, the Conflicts dialog appeared as expected on our end. To help us narrow this down, could you clarify a few things? 
1. Which Git operation triggers the issue? merge, rebase, or cherry-pick? 
2. Do you have any third-party Git or VCS-related plugins installed  Git Flow, GitToolBox,…)? 
3. Does the issue occur on all projects, or a specific one? 
If you can also check Help | Show Log in Finder and look for any exceptions around the time the conflict occurs, that would be very helpful to provide. Thank you!

0
Avatar
Xzhengrui
Created

I'm using Perforce, and the same thing happened to me. Here is the exception log everytime I click the Resolve button
2026-07-29 16:22:31,482 [1128006]   INFO - #c.j.r.p.w.i.WorkspaceModelUpdater - performUpdate finished in 0 ms, total time 9566 ms
2026-07-29 16:22:37,671 [1134195]   INFO - #c.i.m.l.c.q.QuotaManager2Impl - Updating quota refill state
2026-07-29 16:22:37,671 [1134195]   INFO - #c.i.m.l.c.q.QuotaManager2Impl - New quota refill state is: Error(exception=com.intellij.ml.llm.core.quota.ResultDoesNotMatchConditionException: Returned result does not match the condition, previous=null)
2026-07-29 16:22:38,917 [1135441]   INFO - STDERR - Exception in thread "DefaultDispatcher-worker-77" java.lang.IndexOutOfBoundsException: Index 1 out of bounds for length 1
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.base/jdk.internal.util.Preconditions.outOfBounds(Preconditions.java:100)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.base/jdk.internal.util.Preconditions.outOfBoundsCheckIndex(Preconditions.java:106)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.base/jdk.internal.util.Preconditions.checkIndex(Preconditions.java:302)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.base/java.util.Objects.checkIndex(Objects.java:365)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.base/java.util.ArrayList.get(ArrayList.java:428)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.vcs.merge.flow.IterativeMergeFlowDelegate.installTableContextMenu(IterativeMergeFlowDelegate.kt:382)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.vcs.merge.flow.IterativeMergeFlowDelegate.createCenterPanel(IterativeMergeFlowDelegate.kt:144)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.vcs.merge.MultipleFileMergeDialog.createCenterPanel(MultipleFileMergeDialog.kt:174)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.ui.DialogWrapper.init(DialogWrapper.java:1498)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.vcs.merge.MultipleFileMergeDialog.<init>(MultipleFileMergeDialog.kt:167)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.vcs.impl.AbstractVcsHelperImpl.showMergeDialogImpl(AbstractVcsHelperImpl.java:437)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.vcs.impl.AbstractVcsHelperImpl.showMergeDialogWithResult(AbstractVcsHelperImpl.java:429)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.vcs.AbstractVcsHelper.showMergeDialogWithResult(AbstractVcsHelper.java:95)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.vcs.AbstractVcsHelper.showMergeDialog(AbstractVcsHelper.java:120)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.vcs.changes.ChangesViewApiImpl$showResolveConflictsDialog$2$2.invokeSuspend(ChangesViewApiImpl.kt:93)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:34)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:100)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.impl.DispatchedRunnable.run(DispatchedRunnable.kt:42)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.TransactionGuardImpl.runWithWritingAllowed(TransactionGuardImpl.java:246)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.TransactionGuardImpl.access$100(TransactionGuardImpl.java:22)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.TransactionGuardImpl$2.run(TransactionGuardImpl.java:228)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.impl.NonBlockingFlushQueue.runNextEvent$lambda$4(NonBlockingFlushQueue.kt:353)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.concurrency.ThreadContext.resetThreadContext(threadContext.kt:295)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.impl.NonBlockingFlushQueue.runNextEvent(NonBlockingFlushQueue.kt:352)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.impl.NonBlockingFlushQueue.flushNow(NonBlockingFlushQueue.kt:299)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.impl.NonBlockingFlushQueue.FLUSH_NOW$lambda$0(NonBlockingFlushQueue.kt:158)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:323)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:732)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:711)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.kt:731)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.kt:584)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.ide.IdeEventQueue.dispatchEvent$lambda$0$0$0(IdeEventQueue.kt:384)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.ide.IdeEventQueueKt.performActivity$lambda$0(IdeEventQueue.kt:1122)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.openapi.application.TransactionGuardImpl.performActivity(TransactionGuardImpl.java:106)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.ide.IdeEventQueueKt.performActivity(IdeEventQueue.kt:1122)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.ide.IdeEventQueue.dispatchEvent$lambda$0(IdeEventQueue.kt:382)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.kt:422)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:207)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:128)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:117)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:113)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:105)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     at java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:92)
2026-07-29 16:22:38,918 [1135442]   INFO - STDERR -     Suppressed: kotlinx.coroutines.internal.DiagnosticCoroutineContextException: [Kernel@djtku1cmhkn9afuki0av, Rete(abortOnError=false, commands=capacity=2147483647,data=[onReceive], reteState=kotlinx.coroutines.flow.StateFlowImpl@2f7298b, dbSource=ReteDbSource(reteState=kotlinx.coroutines.flow.StateFlowImpl@2f7298b)), DbSourceContextElement(kernel Kernel@djtku1cmhkn9afuki0av), ComponentManager(ProjectImpl@1820713977), com.intellij.codeWithMe.ClientIdContextElementPrecursor@1fad82ad, CoroutineName(com.intellij.openapi.vcs.changes.ConflictsResolutionService), StandaloneCoroutine{Cancelling}@5f0d23f2, Dispatchers.Default]
 

0
Avatar
Elavarasuakhash
Created

Dina Zadoorian 
I’m using Mercurial (hg), and the issue occurs during a merge. It’s not limited to my setup—everyone around me using the same version is experiencing the same problem on macOS. We have just the Mercurial plugin installed, and the issue started after upgrading to this version.
 

0
Avatar
Dina Zadoorian
Created

Thanks for the logs and for the details, they were very helpful.

This is a known bug (IJPL-249379 vcs.merge.conflict.iterative.resolution causes java.lang.IndexOutOfBoundsException) affecting non-Git VCS systems (Mercurial, Perforce, SVN, and others) in 2026.2.0.1. The merge conflict dialog crashes silently on startup due to an IndexOutOfBoundsException in the new iterative conflict resolution code, which is why nothing appears when you click Resolve.

This explains why 2026.2.1 Preview already works for you. The fix is included there and will be part of the upcoming 2026.2.1 stable release.

In the meantime, here's a workaround to restore conflict resolution on 2026.2.0.1:

  • Press Shift twice to open Search Everywhere
  • Type Registry and open the Registry… entry
  • Find the key vcs.merge.conflict.iterative.resolution and disable it
  • Close the Registry and restart the IDE

This should restore the merge dialog. Apologies for the inconvenience!

0

Please sign in to leave a comment.