回退commit
git log git reset --hard <commit_id> git push origin HEAD --force
解决合并冲突
git checkout -b conflict_fix # do some commit conflictly Auto-merging xxx CONFLICT (content): Merge conflict in xxx Automatic merge failed; fix conflicts and then commit the result. # 解决文件中的 <<<<<<< HEAD something older ======= something newer >>>>>>> feature1 git add git commit -m git checkout master git merge conflict_fix git push