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
When there is a conflict in the one branch only (pulling conflicting commits), this plugin does not work. I will get Conflict markers miss common base revision. Ensure you're using 'merge.conflictStyle=diff3' in your gitconfig in my footer. I've already created a Git conflict simulation for my students which simulates a conflict. It can be used to further improve this plugin. Here is the screenshot of my vim after trying the mergetool.
Conflict markers miss common base revision. Ensure you're using 'merge.conflictStyle=diff3' in your gitconfig
The text was updated successfully, but these errors were encountered:
Are you using merge.conflictStyle=diff3? I don't see diff3 anywhere in the repo you linked.
merge.conflictStyle=diff3
diff3
See here: https://github.com/samoshkin/vim-mergetool#conflict-markers-format
Sorry, something went wrong.
No branches or pull requests
When there is a conflict in the one branch only (pulling conflicting commits), this plugin does not work. I will get
![image](https://user-images.githubusercontent.com/6280763/66709522-c66e3a00-ed2b-11e9-95d0-be33a50112f5.png)
Conflict markers miss common base revision. Ensure you're using 'merge.conflictStyle=diff3' in your gitconfig
in my footer.I've already created a Git conflict simulation for my students which simulates a conflict. It can be used to further improve this plugin.
Here is the screenshot of my vim after trying the mergetool.
The text was updated successfully, but these errors were encountered: