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.

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

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 · 4 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
@dakennguyen
Copy link

you can use d2o to choose "ours" and d3o to choose "theirs" or :diffget //2 and :diffget //3 respectively

@brookhong
Copy link
Author

Thanks @dakennguyen. Just tried these 2 combinations, it works but not perfectly, it always left something behind, such as the line below

>>>>>>>> Stashed changes

@dakennguyen
Copy link

have u tried perform d2o/d3o one more time on that line? I'm not sure if it's a but or not, but at least that what's I always do

@brookhong
Copy link
Author

Yes, it works with one more d2o/d3o. But it should not work like that, I assume it should pick ours/theirs and remove all those extra lines.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants