You have not concluded your merge (MERGE_HEAD exists)

如何安全地将Git分支合并到master分支