Unwanted stuff written in file when cherry-picked

55 views Asked by At

Recently I got to know about cherry-pick command in git, and it turns out to be a useful command. I learnt from the resources on how to use it to cherry-pick contents from other's repo. After I used the command, the contents got cherry-picked from other's repo branch, but alongwith them I also had few lines in different parts of the file,

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD

>>>>>>> 53de559...
>>>>>>> 0fa87af

(Such types of unwanted stuff were present wherever changes were made). I just want to know whether these lines would affect the file or are simply required by the git. If they are not required how do I remove them.

I followed steps that were described here

0

There are 0 answers