Git rebase and 'leftover' files

[JESii (Jon Seidel)]

My workflow includes regular updates against the master branch:

git co master
git pull
git co mybranch
git rebase origin/master

However, when I do have conflicts and resolve them, I’m left with a bunch of the merge workfiles after the rebase is complete; i.e., files like

Image.rb.BACKUP.75073.rb
Image.rb.BASE.75073.rb
Image.rb.LOCAL.75073.rb
Image.rb.REMOTE.75073.rb

The conflicts have all been resolved, so I just go ahead and delete them, but I’m wondering if they are a signal that I’m doing something wrong?

[timhabermaas]

Are you using Tortoise by any chance? (see git .BACKUP .BASE .LOCAL .REMOTE files - Stack Overflow)

git actually never creates these files.

[JESii (Jon Seidel)]

Nope; I’m using git on MacOSx and using OpenDiff for my mergetool.

I noticed that there are also files like

Image.rb.orig

left lying around.

[joel (Joel Oliveira)]

@JESii

I’m wondering if they are a signal that I’m doing something wrong?

I don’t think so. I think they’re just a symptom of the merge tool you’re using.

[JESii (Jon Seidel)]

Well… I recently learned that there’s an easy way to clean this stuff up:

git clean -df

Obviously designed for just such an occasion!