How to remove git addons on my page after resolving merge issues?

Question

Recently I had a merge conflict in git. After using some git commands I managed to resolve those conflicts, so my git gives a message that all is ok and up-to-date with branches and with production master. So I was happy that I resolved all conflicts. However - on my production page I noticed strange addons:

<<<<<<< HEAD 

MAIN PAGE CONTENT

=======
>>>>>>> branch

How can I remove them?

@phd indeed, thanks for noticing – gileneusz Jun 18 '18 at 12:04 — gileneusz, Jun 18 '18 at 12:04

score 1 · Accepted Answer · answered Jun 18 '18 at 06:53

1

Git plants these in the text when a merge conflict occurs. Just use your text editor (or IDE) to remove them, add the file and commit it.

answered Jun 18 '18 at 06:53

Mureinik

277,661
50
283
320

thanks for tip, where is this file? – gileneusz Jun 18 '18 at 06:54
@gileneusz This is the actual main page of your application - not something internal to git. – Mureinik Jun 18 '18 at 06:55

How to remove git addons on my page after resolving merge issues?

1 Answers1