Keep showing files whose conflicts have been resolved - #5940
Merged
Conversation
stefanhaller
force-pushed
the
keep-showing-resolved-conflicting-files
branch
from
August 16, 2026 08:39
6528ef2 to
f4815d6
Compare
…ing them The next commit needs to know which files have conflicts, not just how many of them there are. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
When several files have conflicts, resolving one of them makes it vanish from the files panel as soon as it is auto-staged, and it only comes back once the last conflict is resolved and the filter turns off again. By then it sits among all the other changed files of the merge, so it is hard to find the ones whose resulting diff you still wanted to check. So remember which files had conflicts while the conflicted-files filter is on, and keep showing them once they are resolved. This is the general solution that 39513d2 called for; that commit only helped for the case of a single conflicted file. The consequence is that the selection no longer moves on to the next conflicted file when one is resolved: it stays on the file you just resolved, which shows you its diff right away. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
stefanhaller
force-pushed
the
keep-showing-resolved-conflicting-files
branch
from
August 16, 2026 14:45
f4815d6 to
43b47d1
Compare
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When several files have conflicts, resolving one of them makes it vanish from the files panel as soon as it is auto-staged, and it only comes back once the last conflict is resolved and the filter turns off again. By then it sits among all the other changed files of the merge, so it is hard to find the ones whose resulting diff you still wanted to check.
So remember which files had conflicts while the conflicted-files filter is on, and keep showing them once they are resolved. This is the general solution that #5936 called for; that PR only helped for the case of a single conflicted file.
The consequence is that the selection no longer moves on to the next conflicted file when one is resolved: it stays on the file you just resolved, which shows you its diff right away.