30. Resolving Conflicts

最新推荐文章于 2024-06-28 17:51:06 发布

转载最新推荐文章于 2024-06-28 17:51:06 发布 · 587 阅读

git 专栏收录该内容

8 篇文章

订阅专栏

本文介绍如何手动解决Git中出现的合并冲突，通过具体实例详细展示了从冲突产生到解决的全过程，包括冲突文件的手动编辑及最终提交。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

http://githowto.com/resolving_conflicts

Goals

To learn to resolve merging conflicts

01Merge the master branch with style

Let us go back to the style branch and merge it with a new master branch.

RUN:

git checkout style
git merge master

RESULT:

$ git checkout style
Switched to branch 'style'
$ git merge master
Auto-merging lib/hello.html
CONFLICT (content): Merge conflict in lib/hello.html
Automatic merge failed; fix conflicts and then commit the result.

If you open the lib/hello.html you will see:

FILE: LIB/HELLO.HTML

<!-- Author: Alexander Shvets (alex@githowto.com) -->
<html>
  <head>
<<<<<<< HEAD
    <link type="text/css" rel="stylesheet" media="all" href="style.css" />
=======
    <!-- no style -->
>>>>>>> master
  </head>
  <body>
    <h1>Hello,World! Life is great!</h1>
  </body>
</html>

The first section is the version of the current branch (style) head. The second section is the version of master branch.

02Resolution of the conflict

You need to resolve the conflict manually. Make changes to lib/hello.html to achieve the following result.

FILE: LIB/HELLO.HTML

<!-- Author: Alexander Shvets (alex@githowto.com) -->
<html>
  <head>
    <link type="text/css" rel="stylesheet" media="all" href="style.css" />
  </head>
  <body>
    <h1>Hello, World! Life is great!</h1>
  </body>
</html>

03Make a commit of conflict resolution

RUN:

git add lib/hello.html
git commit -m "Merged master fixed conflict."

RESULT:

$ git add lib/hello.html
$ git commit -m "Merged master fixed conflict."
Recorded resolution for 'lib/hello.html'.
[style 645c4e6] Merged master fixed conflict.