Git進行同步的時候，經常會出現沖突，有時候沖突的選項會有圖示中的三種選項：
1、Resolved：直接把文件標識為沖突已經解決，一般是自己手動查看並解決完沖突以后使用。
2、Resolve conflict using "MERGE_HEAD (origin/HEAD)"：這個其實就是以遠端的版本作為最新版本來解決沖突。
3、Resolve conflict using “HEAD”：這個是以本地的版本作為最新版本來解決沖突。
免責聲明！
本站轉載的文章為個人學習借鑒使用，本站對版權不負任何法律責任。如果侵犯了您的隱私權益，請聯系本站郵箱yoyou2525@163.com刪除。
猜您在找
You have not concluded your merge. (MERGE_HEAD exists)
您尚未完成合並(MERGE_HEAD存在)
IDEA Merge into Current時出現You have not concluded your merge (MERGE_HEAD exists)錯誤問題
You have not concluded your merge. (MERGE_HEAD exists)。（轉）
git 提交時出現錯誤 [You have not concluded your merge (MERGE_HEAD exists).]
[轉]解決Git報錯:error: You have not concluded your merge (MERGE_HEAD exists).
fatal: You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you
解決Git報錯：error: You have not concluded your merge (MERGE_HEAD exists). hint: Please,
解決Git報錯:error: You have not concluded your merge (MERGE_HEAD exists).
Git提示You have not concluded your merge. (MERGE_HEAD exists)