Menu
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?
897
Select Stage Changed Files To Commit (Ctrl-I) from Commit menu. Enter a commit comment like "deleted conflicting file" Commit (ctrl-enter) Now if you restart the merge it will (hopefully) work.
An ORIG file is a file that may have been created by various programs. It stores a backup copy of a file, which has been renamed with the . orig extension so that the user knows it is the original. ORIG files are most often created manually by a user rather than by a program.
A merge conflict is an event that occurs when Git is unable to automatically resolve differences in code between two commits. When all the changes in the code occur on different lines or in different files, Git will successfully merge commits without your help.
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
125
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:
32
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
