Git mergetool generates unwanted .orig files

by

A possible solution from git config:

git config --global mergetool.keepBackup false

After performing a merge, the original file with conflict markers can be saved as a file with a .orig extension.
If this variable is set to false then this file is not preserved.
Defaults to true (i.e. keep the backup files).

The alternative being not adding or ignoring those files, as suggested in this gitguru article,

git mergetool saves the merge-conflict version of the file with a “.orig” suffix.
Make sure to delete it before adding and committing the merge or add *.orig to your .gitignore.

Berik suggests in the comments to use:

find . -name \*.orig 
find . -name \*.orig -delete

Charles Bailey advises in his answer to be aware of internal diff tool settings which could also generate those backup files, no matter what git settings are.

  • kdiff3 has its own settings (see “Directory merge” in its manual).
  • other tools like WinMerge can have their own backup file extension (WinMerge: .bak, as mentioned in its manual).

So you need to reset those settings as well.

More Related Contents:

  1. How can I undo git reset –hard HEAD~1?
  2. Which commit has this blob?
  3. Getting Git to work with a proxy server – fails with “Request timed out”
  4. Undo git pull, how to bring repos to old state
  5. Download single files from GitHub
  6. Set up git to pull and push all branches
  7. How is a tag different from a branch in Git? Which should I use, here?
  8. Undo a particular commit in Git that’s been pushed to remote repos
  9. Undo working copy modifications of one file in Git?
  10. How can I stop .gitignore from appearing in the list of untracked files?
  11. What is the difference between “git init” and “git init –bare”?
  12. Should I use SVN or Git? [closed]
  13. How do you get git to always pull from a specific branch?
  14. What are .git/info/grafts for?
  15. What is git-rerere and how does it work?
  16. ‘git pull origin mybranch’ leaves local mybranch N commits ahead of origin. Why?
  17. Get changes from master into branch in Git
  18. How to preview git-pull?
  19. git diff between cloned and original remote repository
  20. git: switch branch without detaching head
  21. git-svn: what’s the equivalent to `svn switch –relocate`?
  22. git commit frequency
  23. How do I reset or revert a file to a specific revision?
  24. Is there a migration tool from CVS to Git?
  25. How do I check out a specific version of a submodule using ‘git submodule’?
  26. Differences between git pull origin master & git pull origin/master
  27. Ignoring an already checked-in directory’s contents?
  28. Git Ignores and Maven targets
  29. How to perform a three-way diff in Git without merging?
  30. Commit a file to a Different Branch Without Checkout

Leave a Comment