[Git] Two Merge Cases

1. The Happy Case

1) Make a branch of version2

2) Three commits on version2

3) Merge version2 into Main

 

In this case, there would be no issue.

Start on master, make only a branch on master, and just merge.

 

 

2. A bit of unhappy case.

1) Make two branches of version2, version3

2) Some commits on version2

3) Other commits on version3

4) Merge version3 into Main, it will be mostly okay.

5) Merge version2 into Main. If you work the same file on version2, It's supposed to have a trouble.

 

 

- P.S. The website of learngitbranching would come in handy.