$ git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge
$ git reset --merge
大体これで解決します。
More than 5 years have passed since last update.
Register as a new user and use Qiita more conveniently
- You get articles that match your needs
- You can efficiently read back useful information
- You can use dark theme