We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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
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.
co/ct
The text was updated successfully, but these errors were encountered:
you can use d2o to choose "ours" and d3o to choose "theirs" or :diffget //2 and :diffget //3 respectively
d2o
d3o
:diffget //2
:diffget //3
Sorry, something went wrong.
Thanks @dakennguyen. Just tried these 2 combinations, it works but not perfectly, it always left something behind, such as the line below
>>>>>>>> Stashed changes
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
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.
No branches or pull requests
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.The text was updated successfully, but these errors were encountered: