Now there is a test.txt in the master branch master and branch branch01, and now the content in them is the same (because of the state of just establishing the branch)
1. Now change the test.txt in branch 01 (add a line of content)
2. Move the branch to master, the change in branch 01 does not affect the master branch
3. Now the main branch adds information
4. Incorporate branch 01 into the master The branch
shows the conflict, the two branches are different in the second line.
At this time, the file is changed like this.
To resolve the conflict, you need to make a decision to delete which part of the conflict, and then submit
it. Now only keep the branch.
