feat: bind resolve and next conflict to Ctrl+Alt+U/J - #52
Merged
Conversation
Expose editor.resolveConflict and editor.nextConflict as rebindable shortcuts with defaults matching the palette hints, and advertise them in the help table. Co-authored-by: Nicholas Adamou <nicholasadamou@users.noreply.github.com>
|
Warning Review limit reachedNext included review available in 59 minutes. View limit detailsLimit details: You’ve used the included review currently available. You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Review configuration: ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (7)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
The Source control help row for resolve/next conflict pushed the last section past the previous 60-arrow budget on a short terminal. Co-authored-by: Nicholas Adamou <nicholasadamou@users.noreply.github.com>
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
2 participants
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.
Summary
Bind merge-conflict resolve and next-conflict to default chords (
Ctrl+Alt+U/Ctrl+Alt+J), advertise them in KEYBINDABLE and the help overlay, and keep custom rebinds working.Also bumps the short-terminal help scroll test so the extra Source control row still reaches
Editor → tree.Test plan
bun test test/git/conflict-editor.test.tsxbun test test/help-scroll.test.tsxNeed help on this PR? Tag
@codesmith-botwith what you need. Autofix is disabled.