Conflict between merge and rebase

A conflict occurs when two users modify the same region of the same file.

Switch 1、to the sub-branch chengdr, and enter the text "Hello word!" In newtxt1.txt !!!" -> Add to index-> commit-> push

2. Switch to the sub-branch chengdr2. In newtxt1.txt, enter the text "Hello word"-> Add to index-> commit

3. Perform the fetch operation.

4. Execute the merge operation of the chengdr2 Branch and the chengdr branch on the server, and the following error occurs:

The content in the file is as follows:

5、right-click newtxt1.txt-> Team-> merge Tool

6. After OK, the latest local file version and the server file content will be compared.

7. After negotiation, if the text here is considered as "Hello wordyellow, right-click newtxt1.txt-> Add to index-> commit, the conflict is resolved successfully.

8. Then push the chengdr branch to the server.