Git Conflict

系统管理员 2022-06-05 01:35 160阅读 0赞

If the command ‘git pull origin master’ generates a conflict, solution as follows:  
![这里写图片描述][SouthEast]

For this case, Git can’t execute ‘fast merge’ and only try to merge their own modifications, but the merge may conflict.  
Let’ try to merge feature1 to master. When we execute the command ‘git merge feature1’, Some information will show up.

$ git merge feature1
    Auto-merging readme.txt
    CONFLICT (content): Merge conflict in readme.txt
    Automatic merge failed; fix conflicts and then commit the result.

For this, we can use ‘git status’ to view conflict files.

$ git status
    # On branch master
    # Your branch is ahead of 'origin/master' by 2 commits.
    #
    # Unmerged paths:
    # (use "git add/rm <file>..." as appropriate to mark resolution)
    #
    # both modified: readme.txt
    #
    no changes added to commit (use "git add" and/or "git commit -a")

We view directly the conflict file ‘readme.txt’.

Git is a distributed version control system.
    Git is free software distributed under the GPL.
    Git has a mutable index called stage.
    Git tracks changes of files.
    <<<<<<< HEAD 
    Creating a new branch is quick & simple. 
    ======= 
    Creating a new branch is quick AND simple. 
    >>>>>>> feature1

Git will label different content of branches by ‘<<<<<<<’, ‘=======’ and ‘>>>>>>>’, then we do modify:

Git is a distributed version control system.
    Git is free software distributed under the GPL.
    Git has a mutable index called stage.
    Git tracks changes of files.
    Creating a new branch is quick AND simple.

Next, we can submit our files.

$ git add readme.txt 
    $ git commit -m "conflict fixed"
    [master 59bc1cb] conflict fixed

After some operations, the relationship of master and feature1 as follows:  
![这里写图片描述][SouthEast 1]

Of course, we can use ‘git log’ command to view the merge result of branches.  
Command as: git log –graph –pretty=oneline –abbrev-commit  
At last, we will delete feature1 branch.  
Finish work.

#### Summary ####

1\# When Git can’t merge branches, only to resolve all conflicts, then submit all files. Finish as last.  
2\# ‘git log –graph’ command can view branch merge graph.

[SouthEast]: /images/20220605/77821f3a47c147c090094ef52ad0b8d2.png
[SouthEast 1]: /images/20220605/de47028d3a074f809081c753303f4b3d.png