fatal: You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge.
とgitに言われたら、
$ git reset --merge
via! ikeyasuki’s diary
fatal: You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge.
とgitに言われたら、
$ git reset --merge
via! ikeyasuki’s diary