Git how to remove conflict markers from files? -

this question has answer here:

• git merge left head marks in files 3 answers

>>>>>>> master       .row         - @power.next_invoice.tap |invoice|          %p           = link_to t(".postings"), postings_path <<<<<<< head     .span9{style: 'margin-top: 50px;'} =======     .span9 >>>>>>> master 

somehow these master , head comments/code have been added on code in files. how remove them?

this happens when have merge conflict between 2 commits in git repository.

you can either use mergetool, or can manually delete these instances (if editor allows search , replace, search instances of <<<<<<< head , >>>>>>> master delete them)

in example, can see there have duplicate code here -

<<<<<<< head     .span9{style: 'margin-top: 50px;'} =======     .span9 >>>>>>> master 

you have decide if wan .span9{style: 'margin-top: 50px;'} or if want .span9 (i assuming have more css definitions below that). , delete other option accordingly. ====== should removed.

once have made decision, should run

git status 

which show you have updated particular css file , chances have .orig copy of file created git. delete .orig file, , git add/commit complete merge conflict resolution.