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?