← Back to Upcase

Git rebase and 'leftover' files


(Jon Seidel) #1

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?


(Tim Habermaas) #2

Are you using Tortoise by any chance? (see http://stackoverflow.com/questions/14044765/git-backup-base-local-remote-files)

git actually never creates these files.


(Jon Seidel) #3

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 Oliveira) #4

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


(Jon Seidel) #5

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!