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

  • Is there any git repository with official daily updated Gentoo portage?
  • How to use git with Symfony 2?
  • how do you push only some of your local git commits?
  • Importing a Subversion repository with a non-standard layout into Git
  • Deploy a project using Git push
  • Generic git reset to default upstream HEAD
  • 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:

    pom.xml merge=ours

    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:

    <<<<<<< HEAD
    >>>>>>> origin/master

    What am I doing wrong?

  • SSH Key - Still asking for password and passphrase
  • Are java .class files needed after an application is running?
  • Migration from svn to git. Which option is the best: giant trunk, submodules, subtrees
  • Git On Windows Without Cygwin?
  • Error while fetching git file using Bundler
  • npm git protocol dependencies
  • 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 pom.xml)

    git merge -s ours
    Git Baby is a git and github fan, let's start git clone.