Remove git comments from files

Question

Something weird happened this morning when I did a commit. I got an error, said to pull, I then pushed and all the files with new changes now have comments such as:

<<<<<<< HEAD
=======
>>>>>>> d737b374ebaef4b0f7bd4e3b008e8c4740beca4c

They are in the repo that way. How can I recover my files without going through all of them and removing them manually?

And why the heck did this happen is a more important question. Renders the concept of versioning useless - just spent an hour cleaning this mess

Was a pretty standard one I saw before - something about unmerged changes, perform a git pull etc.. — cyberwombat, Jun 15 '13 at 19:24
Not anymore, but it merged all the comments after I pulled, push — cyberwombat, Jun 15 '13 at 19:30
And there is nothing between early version and versions with comments so manual remove might be the only way — cyberwombat, Jun 15 '13 at 19:31

score 0 · Accepted Answer · edited May 23 '17 at 11:56

0

just spent an hour cleaning this mess

It is a job for bfg then:

bfg --replace-text markers.txt  my-repo.git

With markers.txt including:

regex:<<<.*>>>=

That would get rid of all those merge markers in no time.

BFG repo cleaner is an alternative to git-filter-branch.

You would need to tweak a bit if you need to keep the HEAD part only:

# remove just <<< line
regex:<<<.*$
# remove everything after ===
regex:===.*>>>

edited May 23 '17 at 11:56

Community

1
1

answered Jun 15 '13 at 21:18

VonC

1,262,500
529
4,410
5,250

Would that leave the HEAD code intact? i.e. <<< HEAD (leave this) ==== (remove this) >>>>xxxxx – cyberwombat Jun 16 '13 at 01:25
@Yashua no I have edited the answer to show how to leave HEAD and remove the rest. – VonC Jun 16 '13 at 06:59

Remove git comments from files

1 Answers1