Skip to content

[Source control][Merge changes] Focus jumps to "Staged Changes" instead of the next conflicted file #338317

Description

Does this issue occur when all extensions are disabled?: Yes

  • VS Code Version: 1.139.1
  • OS Version: Windows 11

Type: Bug / UX Improvement 

Description:
When dealing with a large number of merge conflicts, resolving a conflict causes the UI focus to jump unexpectedly. 

Steps to Reproduce: 

  1. Open the Source Control view during a merge with many conflicted files.
  2. Select and focus on the very first file under the "Merge Changes" section.
  3. Resolve the conflict for this file.

Actual Behavior:
As soon as the conflict is resolved, the focus automatically jumps down to a file in the "Staged Changes" section. When there are dozens of files, this requires constant scrolling and manual searching to find where you left off. 

Expected Behavior:
The focus should move to the next available file in the "Merge Changes" list right below the one that was just resolved.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Labels

new releaseIssues found in a recent release of VS Code

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions