3 ms·
This is a simple example with only two feature branches, and it's already a bit hard to follow. Imagine it with even twelve which is not even that many branches
by rhinoceraptor 3y ago
This is a simple example with only two feature branches, and it's already a bit hard to follow. Imagine it with even twelve which is not even that many branches:
* Merge Branch 'B' into 'main'
|\
* \ Merge Branch 'A' into 'main'
|\ \
| | |
| | * B Commit 2
| | * Merge remote-tracking branch 'upstream/main'
| * | A commit 2
| * | Merge remote-tracking branch 'upstream/main'
| | * B commit 1
| |/
| * A commit 1
|/
*
Compared to a commit graph where feature branches are rebased to replay their commits against the tip of main before merging:
* Merge branch 'B' into 'main'
|\
| * B commit 2
| * B commit 1
|/
* Merge branch 'A' into 'main'
|\
| * A commit 2
| * A commit 1
|/
*