.gitattributes & individual merge strategy for a file

by

I had the same error and it can be solved just defining an “ours” merge driver in .git/config:

[merge "ours"]
    name = "Keep ours merge"
    driver = true

Since true always return 0 the temporary file holding the current state will not be changed and will stay as the final version.

You can read more about merge driver in here: http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html#_defining_a_custom_merge_driver

Addendum:

This works any time the driver is actually called and this seems to occur only when there are commits changing the same files (git the merge attribute). If there are changes in a single branch the driver is not going to be called.

More Related Contents:

  1. Git – Difference Between ‘assume-unchanged’ and ‘skip-worktree’
  2. Git, fatal: The remote end hung up unexpectedly
  3. How can I undo pushed commits using git?
  4. How can I merge two commits into one if I already started rebase?
  5. How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
  6. Git SSH error: “Connect to host: Bad file number”
  7. git, msysgit, accents, utf-8, the definitive answers
  8. ‘git diff’ doesn’t show enough
  9. How can I tell if one commit is a descendant of another commit?
  10. How do I find and restore a deleted file in a Git repository?
  11. How do I create a remote Git branch?
  12. How can I calculate the number of lines changed between two commits in Git?
  13. Git is ignoring files that aren’t in gitignore
  14. gitignore binary files that have no extension
  15. Install specific git commit with pip
  16. Git: What’s the best practice to “git clone” into an existing folder?
  17. How to revert initial git commit?
  18. git: Switch branch and ignore any changes without committing
  19. How to preview git-pull?
  20. Commit to multiple branches at the same time
  21. Checkout part of a branch in Azure DevOps Pipelines (GetSources)
  22. Git: merging public and private branches while while keeping certain files intact in both branches
  23. How do I change the URI (URL) for a remote Git repository?
  24. git clone, ignoring a directory
  25. Rebasing and what does one mean by rebasing pushed commits
  26. How can I rewrite history so that all files, except the ones I already moved, are in a subdirectory?
  27. git find fat commit
  28. In Git, what is the difference between long and short hashes?
  29. backing up project which uses git
  30. Git equivalents of most common Mercurial commands?

Leave a Comment