Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature: is it possible to add some key mappings to choose ours/theirs for conflicts resolving? #2383

Open
brookhong opened this issue Mar 8, 2025 · 0 comments
Open

feature: is it possible to add some key mappings to choose ours/theirs for conflicts resolving? #2383

brookhong opened this issue Mar 8, 2025 · 0 comments

Comments

@brookhong
Copy link

For example, in the middle buffer, we can use some shortcuts like co/ct to choose ours/theirs to fix the conflict without manual edit.

Image
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@brookhong