我有一些本地提交,而主分支上也有更改。所以我执行了以下操作:
git pull // it automatically merged and had a conflict with one file only.
subl <file> // Made the wrong fix and saved it
git commit // It opened nano and I Typed "fixed merge" saved it
git push master origin
我要如何回到合并之前,重新进行合并和推送操作?尤其是回到合并之前的状态。