Skip to content

fix bugs with merge editor a11y help#244658

Merged
meganrogge merged 1 commit intomainfrom
merogge/merge-editor-fix
Mar 26, 2025
Merged

fix bugs with merge editor a11y help#244658
meganrogge merged 1 commit intomainfrom
merogge/merge-editor-fix

Conversation

@meganrogge
Copy link
Collaborator

@meganrogge meganrogge commented Mar 25, 2025

Before it:

  • didn't open when alt+f1 was invoked in the merge editor
  • included a non-existent command
  • didn't provide keybindings for commands (follow suit with other help dialogs)
  • didn't include various helpful commands
  • included comment info, unrelated to this dialog

Now it:

  • actually shows up when alt+f1 is invoked in a merge editor
  • provides the keybindings (all currently unassigned) to users, allowing them to configure them
  • removes a non-existent command in favor of the actual ones
  • removes unnecessary comment info from the dialog

fixes #244656
fixes #227844

@meganrogge meganrogge requested a review from hediet March 25, 2025 19:54
@meganrogge meganrogge self-assigned this Mar 25, 2025
@meganrogge meganrogge added this to the March 2025 milestone Mar 25, 2025
@meganrogge meganrogge enabled auto-merge (squash) March 25, 2025 19:55
@meganrogge meganrogge merged commit 24f1858 into main Mar 26, 2025
8 checks passed
@meganrogge meganrogge deleted the merogge/merge-editor-fix branch March 26, 2025 09:28
@vs-code-engineering vs-code-engineering bot locked and limited conversation to collaborators May 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

2 participants