Edited at

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

More than 1 year has passed since last update.

$ git pull

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

$ git reset --merge

大体これで解決します。