1. resolve the conflict, remove the code in the code contradictory, then upload or drop-down
MERGING appear when git pull or git push, merge conflicts explain the code
to open the file conflict, post-conflict file under normal circumstances would be:
<<<<<<<<HEAD
//别人的代码
========
//你的的代码
>>>>>>>>your branch name
When conflict resolution code, try to put all the different codes reserved, leaving only a common code
after the code to resolve the conflict, and commit to re-add the final push
2. git pull back before the local code
Check your local input git reflog submit records to find the version number of the latest commit,
then git reset --hard HEAD @ {version} fall back to the local code before the operation
3.discard remove the download or upload code, then respectively, check out the two branches
