.gitattributes merge driver is not used
At first, I know this question How do I tell git to always select my local version for conflicted merges on a specific file? but this post doesn’t help me and I can’t add any comments because of my reputation.
http://git-scm.com/book/en/Customizing-Git-Git-Attributes suggests to set the merge strategy to ours for the path instead of setting a custom merge driver.
- Atlassian Stash says that the second pull request merged remotely
- Git conflicts on master when policies in VSTS
- How to list what changed during a merge in Git?
- A separate commit for conflict resolution with git merge
- Move a file/directory but still merge changes easily?
- Git Workflow Issue - Squashed Commits and Conflicts
What is the benefit and differene of adding a custom merge driver return an exit code 0?
I have a .gitattributes file on my repos top level:
But when I merge two branches with changed pom.xml files the merge can’t be resolved:
$ git merge origin/master Auto-merging pom.xml CONFLICT (content): Merge conflict in pom.xml Automatic merge failed; fix conflicts and then commit the result.
And I get a standard merge conflict result:
<pom> <<<<<<< HEAD <version>0.88-SNAPSHOT</version> ======= <version>0.87.0</version> >>>>>>> origin/master </pom>
What am I doing wrong?
One Solution collect form web for “.gitattributes merge driver is not used”
You can declare a merge driver, but that means you have to define it on the git config, as in “
.gitattributes & individual merge strategy for a file”:
[merge "ours"] name = "Keep ours merge" driver = true
That allows for a merge strategy for a file, or set of files, as opposed to the
-s option for
git merge strategies, which doesn’t require you to define a driver, but which would resolve the conflict for all files (not just for
git merge -s ours