my code was working fine until I made a git push to a branch.

Now I see, <<<<<<< Updated upstream and >>>>>>> Stashed changes everywhere in my local and branch repo. How do I bring it back or remove those above mentioned

CodePudding user response：

This is probably a merge conflict so you made changes and someone else made changes to the remote branch as well you pulled and then there were conflicts

The only way to fix it and keep the written code is to remove these merge conflicts.

Bascially you have to check every file with such merge conflicts and fix the "errors" by hand.

>>>>>>>>>>>>> these just highlight one of the conflicts <<<<<<<<<<<<<< these are the end of the conflict of one branch.