[英]How do I get reason of a merge conflict after executing merge/rebase?
Git合並/重新顯示沖突原因:
CONFLICT (delete/modify): res/layout/dialog_item.xml deleted in dialog and modified in HEAD. Version HEAD of res/layout/dialog_item.xml left in tree.
CONFLICT (content): Merge conflict in src/DialogAdapter.java
執行git merge / rebase后如何獲得它?
git status
僅顯示此信息的一部分
打開沖突文件並搜索標記
通常他們看起來像這樣
>>>>>>> HEAD
<<<<<<BRANCH
聲明:本站的技術帖子網頁,遵循CC BY-SA 4.0協議,如果您需要轉載,請注明本站網址或者原文地址。任何問題請咨詢:yoyou2525@163.com.