Avoid orphaned .orig files after resolving conflicts from a Git merge

Question

After I perform a Git merge and resolve the conflicts, there are leftover .orig versions of the conflicting files. How can I automatically delete those after the conflict is successfully resolved?

possible duplicate of [Diff tool generates unwanted .orig files](http://stackoverflow.com/questions/1251681/diff-tool-generates-unwanted-orig-files) — Shoe, Jan 21 '13 at 14:42
Possible duplicate of [Git mergetool generates unwanted .orig files](https://stackoverflow.com/questions/1251681/git-mergetool-generates-unwanted-orig-files) — ruffin, May 27 '17 at 11:37

score 53 · Answer 1 · edited Mar 14 '12 at 10:10

53

It's the git mergetool that produces these files, you can disable them with this command:

git config --global mergetool.keepBackup false

See the git-config manpage:

http://man.he.net/man1/git-config

edited Mar 14 '12 at 10:10

inazaruk

74,247
24
188
156

answered Oct 10 '11 at 11:21

Simon Stender Boisen

3,413
20
23

I've got response: $ git config global mergetool.keepBackup false error: key does not contain a section: global – Eugene Oct 10 '11 at 13:02
Sorry for the late response but i'm putting it here for any future visitors. You forgot to add - infront of global when you called git config. -global is a flag that tells git to operate on the global (per machine) configuration instead of the local per repository one. – Simon Stender Boisen Nov 29 '11 at 15:40
3

Watch out for the dash infront of -global -- because of the formatting that dash is not compatible with the command line. Use this `git config --global mergetool.keepBackup false` – Alex Le Dec 06 '11 at 05:09
1

The orig files may also be created by the external merge tool (kdiff3). See this Q/A: http://stackoverflow.com/questions/1251681/diff-tool-generates-unwanted-orig-files – kevinarpe Feb 15 '13 at 10:06

score 5 · Answer 2 · answered May 05 '17 at 05:11

Quite likely those files are created by KDiff3 tool you probably using for merging files. The easiest way to solve the problem is where it was originated:

open KDiff3,
go to Settings / Configure KDiff3 / Directory,
un-tick checkbox "Backup files (.orig)"

score 1 · Answer 3 · edited May 23 '17 at 10:31

1

I think this should work:

git status -su | grep -e"\.orig$" | cut -f2 -d" " | xargs rm

See https://stackoverflow.com/a/10744524/670915 for details

edited May 23 '17 at 10:31

Community

1
1

answered May 29 '13 at 13:55

adubr

779
7
21

score 0 · Answer 4 · answered Oct 10 '11 at 11:20

Git doesn't create *.orig files. It only marks the sections in the conflicting file with <<<< ... ==== ... >>>>.

Which tool are you using? You'll have to disable it there.

But tools like WinMerge indeed create these files, but they automatically process and remove them when you mark the file as resolved within the editor.

score -1 · Answer 5 · edited Oct 28 '12 at 01:25

-1

Even I was geting the same error, when I copy + paste the command from a word document. But I tried removing the -- before the switch global and re-type it manually on the command prompt. It WORKED!

May be it was due to some mis-interpretation of the Charectes in the MS_Wrod and the Command Prompt.

edited Oct 28 '12 at 01:25

Kjuly

34,476
22
104
118

answered Apr 10 '12 at 07:46

SVS

9

Avoid orphaned .orig files after resolving conflicts from a Git merge

5 Answers5