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

It's not possible to merge conflicts in the same branch. #11

Open
MoezGholami opened this issue Oct 13, 2019 · 1 comment
Open

It's not possible to merge conflicts in the same branch. #11

MoezGholami opened this issue Oct 13, 2019 · 1 comment

Comments

@MoezGholami
Copy link

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.
image

@idbrii
Copy link

idbrii commented Apr 18, 2020

Are you using merge.conflictStyle=diff3? I don't see diff3 anywhere in the repo you linked.

See here: https://github.com/samoshkin/vim-mergetool#conflict-markers-format

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