1)sync 有异常
1) git prior sync failed; rebase still in progress
git rebase --abort
git am --abort
2)commit 有丢失,切换回本地分支
2) discarding 3 commits
git checkout $BRANCHNAME
1)sync 有异常
1) git prior sync failed; rebase still in progress
git rebase --abort
git am --abort
2)commit 有丢失,切换回本地分支
2) discarding 3 commits
git checkout $BRANCHNAME