git resolve conflicts

1. Branch conflict

2. View conflict files

Git uses <<<<<<<, =======, to >>>>>>>mark the content of different branches, we modify it as follows and save it:

 

Modify conflicting files.

 

can use:

 git log --graph --pretty=oneline --abbrev-commit

command to see the branch merge graph.