0

I have resolved a conflict using p4Merge. It worked and the file now has the updated text. However in the folder is a load of junk like...

  • --> file.txt.BACKUP
  • --> file.txt.BASE
  • --> file.txt.LOCAL

How do I made sure my merge tool cleans up these files afterwards?

Exitos
  • 29,230
  • 38
  • 123
  • 178
  • You can use `git clean -f` to remove all untracked files. If the merge backups are your only untracked files, that should do the trick. – mwcz Apr 08 '15 at 15:38
  • why don't you make an answer and I can mark it correct? – Exitos Apr 08 '15 at 15:54
  • possible duplicate of [Diff tool generates unwanted .orig files](http://stackoverflow.com/questions/1251681/diff-tool-generates-unwanted-orig-files) – Andrew C Apr 08 '15 at 20:58

1 Answers1

0

git clean should do the trick.

git clean -f

That will remove to remove all untracked files in your repository, so be wary of inadvertently deleting other files. If the merge backups are your only untracked files, go to town. :)

mwcz
  • 8,949
  • 10
  • 42
  • 63