0
0

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?

More than 1 year has passed since last update.

【Git】fatal: You have not concluded your merge. (MERGE_HEAD exists) 解消法

Posted at

状況

git merge developを実行した際に次のようなエラーが発生する。

$ git merge develop
fatal: You have not concluded your merge. (MERGE_HEAD exists)

解消法

git merge developを実行する前にgit reset --mergeを実行することで解消する。

git reset --merge
0
0
0

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
0
0

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?