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

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


git merge

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

git merge

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:

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

git merge

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

Recent Posts
How can I color dots in a xy scatterplot according to column value?
How to update a claim in ASP.NET Identity?
What does {0} mean when initializing an object?
Accessing members of items in a JSONArray with Java
How to log SQL statements in Spring Boot?
Powershell Get-WebSite name parameter is ignored
How to detect scroll to bottom of html element
Java synchronized method
How to test controllers with CodeIgniter?
Detect Visual Composer
Matplotlib: Specify format of floats for tick labels
Rails join a list of strings with commas and "and" before the last