git合并分支有冲突

当我们在Git中合并分支时，如果两个分支中的同一文件的同一部分被修改了，就会发生冲突。此时，Git会提示我们手动解决冲突。以下是解决冲突的步骤：

1.使用git merge命令合并分支，如果发生冲突，Git会在命令行中输出一些描述信息，以便让我们知道有冲突发生。

2.使用git status命令查看冲突的详情，Git会列出所有未合并的文件。

3.打开冲突文件，手动解决冲突。Git会在冲突文件中用<<<<<<<，=======和>>>>>>>标记出不同分支的内容。我们需要根据需要修改文件，然后删除这些标记。

4.使用git add命令将修改后的文件标记为已解决冲突。

5.使用git commit命令提交合并结果。

以下是一个解决冲突的例子：

$ git merge feature
Auto-merging merge.txt
CONFLICT (content): Merge conflict in merge.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git status
On branch main
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

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

        both modified:   merge.txt

no changes added to commit (use "git add" and/or "git commit -a")
$ cat merge.txt
This is a line in the main branch.
<<<<<<< HEAD
This is a line in the feature branch.
=======
This is another line in the main branch.
>>>>>>> feature
$ vim merge.txt
$ cat merge.txt
This is a line in the main branch.
This is a line in the feature branch.
This is another line in the main branch.
$ git add merge.txt
$ git commit -m "Merge feature branch"