Geek Answers Handbook

Git added a lot of error messages <<<<< to my source code

I am very new to using Git, so many things go away from me. Yesterday I tried to perform a git revert operation that failed, and it generated some error about merging or other. I found a workaround by cloning my repository and then using

$ git reset --hard SHA1_HASH

to return to the previous commit. Unfortunately, now my code is packed with a lot of extra stuff like

<<<<<<<<<<<< HEAD
//some stuff
=======
//other stuff
>>>>>>>>>>>> parent of 1ae3953... Removed duplicate folders

How to remove this material? It is very difficult for me to go through all my files and delete them manually ... Is there a way for git to delete it?

EDIT: , - . , - , git ? - ?

+5
1

, , - git pull, . , .

git reset --hard , . git reset --hard, , , - .

+14

More articles:


All Articles