Skip to content

make merge editor more accessible#247156

Merged
meganrogge merged 6 commits intomainfrom
merogge/merge-editor
Apr 23, 2025
Merged

make merge editor more accessible#247156
meganrogge merged 6 commits intomainfrom
merogge/merge-editor

Conversation

@meganrogge
Copy link
Collaborator

@meganrogge meganrogge commented Apr 22, 2025

fixes #227843
fixes #227842
fixes #202877
fixes #227841

  • Added alerts when switching between editors in the merge editor so users know which they’re currently in
demo.mov
  • Added a new command to toggle between the "Current" and "Incoming" change editor inputs via keyboard
toggle.mov
  • Added a ctrlCmd+Enter keybinding for Complete Merge action to align with other execute/complete actions
  • Introduced more descriptive names for Accept All Changes actions
  • Updated the accessibility help dialogs to reflect these changes

@meganrogge meganrogge marked this pull request as draft April 22, 2025 18:39
@meganrogge meganrogge added this to the April 2025 milestone Apr 22, 2025
@meganrogge meganrogge self-assigned this Apr 22, 2025
@meganrogge meganrogge requested a review from hediet April 22, 2025 18:49
@meganrogge meganrogge marked this pull request as ready for review April 22, 2025 19:54
@meganrogge meganrogge enabled auto-merge (squash) April 22, 2025 19:55
@meganrogge meganrogge changed the title merge editor accessibilty improvements make merge editor more accessible Apr 22, 2025
@meganrogge meganrogge disabled auto-merge April 23, 2025 14:18
@meganrogge meganrogge enabled auto-merge (squash) April 23, 2025 14:18
@meganrogge meganrogge closed this Apr 23, 2025
auto-merge was automatically disabled April 23, 2025 14:18

Pull request was closed

@meganrogge meganrogge reopened this Apr 23, 2025
@meganrogge meganrogge enabled auto-merge (squash) April 23, 2025 14:19
@meganrogge meganrogge merged commit ca2881a into main Apr 23, 2025
8 checks passed
@meganrogge meganrogge deleted the merogge/merge-editor branch April 23, 2025 14:33
@vs-code-engineering vs-code-engineering bot locked and limited conversation to collaborators Jun 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

3 participants