プッシュ↑① プル↓①で残ってしまった時の対処

$ git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge

$ git reset --merge

大体これで解決します。

Sign up for free and join this conversation.
Sign Up
If you already have a Qiita account log in.