ChatGPT would be better than whatever wrote this, I had to stop reading.
They do cost more than this product though.
now I wake up with my phone at 100% every time!
They had billing accounts set up for all their projects. They were happy to hand over money but had no ability to.
In particular, they show the following comparison:
Merge:
-> C3 -> C5 -> C7
/ /
C1 -> C2 -> C4 -> C6
Rebase: -> C3 -> C5] -> C3' -> C5'
/ /
C1 -> C2 -> C4 -> C6
However, a more realistic example of a feature branch that lives for even a few days looks like this:Merge:
-> C3 -> C5 -> C7 -> C9 -> C11 -> C13 --------> C15
/ / / / \
C1 -> C2 -> C4 -> C6 -> C8 -> C10 -> C12 -> C14 -> C16 -> C17 -> C18
The final history after rebase being: -> C3' -> C5' -> C9' -> C13'
/ \
C1 -> C2 -> C4 -> C6 -> C8 -> C10 -> C12 -> C14 -> C16 -> C17 --------------------------> C18
A much much simpler history to follow, and obviously shorter.And the complexity without rebase grows even more if more people are doing local merges and pushing to the same remote branch.
or for forwards-compatibility.