git branch knowledge

4.1 Git_branch_overview

insert image description here
insert image description here
insert image description here

4.2 Git_branch_advantages

insert image description here

4.3 Git_Branch_View&Create&Switch

insert image description here

4.4 Git_branch_merge branch (normal merge)

insert image description here

4.5 Git_branch_merge branch (conflict merge)

insert image description here
insert image description here
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
insert image description here
insert image description here

5.1 Git_Team Collaboration

insert image description here

5.1 Git_cross-team collaboration

insert image description here

Guess you like

Origin blog.csdn.net/weixin_45334970/article/details/123801075