CODEWITHSUNDEEP
git
karthik
karthik

Reputation: 355

avoid unwanted comment line into files in git merge/rebase

how to avoid this comment line into the files while git merge/rebase through terminal

comment line : <<<<<<< HEAD comment line : >>>>>>> student 

<<<<<<< HEAD
6th change // from master
=======
5th change // student branch
>>>>>>> student

Upvotes: 0

Views: 146

Answers (1)

greydet
greydet

Reputation: 5539

Instead of avoiding them, you could properly resolve the merge conflict using an appropriate merge tool.

Refer to

Upvotes: 1

Related Questions