📌  相关文章
📜  错误:无法提取,因为您有未合并的文件.提示:在工作树中修复它们,然后使用 &#39;git add rm<file> &#39; 提示:酌情标记解决方案并进行提交.致命的:由于未解决的冲突而退出.代码示例

📅  最后修改于: 2022-03-11 14:49:41.584000             🧑  作者: Mango

代码示例10
repo_clone $ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commit each, respectively.
  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.
  (fix conflicts and run "git commit")

Unmerged paths:
  (use "git add ..." to mark resolution)

        both modified:      file