git_branch
4.1 Git_branch_overview
4.2 Git_branch_advantages
4.3 Git_Branch_View&Create&Switch
4.4 Git_branch_merge branch (normal merge)
4.5 Git_branch_merge branch (conflict merge)
If there is a conflict, you can switch back to the main branch, manually modify the content to be kept on the main branch, and then submit (submit without file name), and finally merge the
contents of the slave branch will not change