How to conclude your merge of a file?

后端 未结 6 1509
天命终不由人
天命终不由人 2021-01-29 23:34

After I merged a file in Git I tried to pull the repository but error came up:

You have not concluded your merge. (MERGE_HEAD exists)

<
6条回答
  •  予麋鹿
    予麋鹿 (楼主)
    2021-01-29 23:49

    If you encounter this error in SourceTree, go to Actions>Resolve Conflicts>Restart Merge.

    SourceTree version used is 1.6.14.0

提交回复
热议问题