解決辦法：setting ==》Tools ==》 Diff & Merge ==》External Diff Tools 把 下面兩個對勾取消掉
免責聲明！
本站轉載的文章為個人學習借鑒使用，本站對版權不負任何法律責任。如果侵犯了您的隱私權益，請聯系本站郵箱yoyou2525@163.com刪除。
猜您在找
GitHub合並（merge）代碼時沖突解決
git merge 沖突解決
idea git merge代碼
git pull和git merge區別&&Git沖突：commit your changes or stash them before you can merge. 解決辦法
利用idea解決git代碼沖突問題
Git提交代碼沖突：commit your changes or stash them before you can merge.
git 代碼比較工具，分支沖突解決
新手：git回滾代碼，合並代碼解決沖突
git文件沖突合並的報錯：Your local changes to the following files would be overwritten by merge
Git沖突：commit your changes or stash them before you can merge. 解決辦法