by floriangosse on 4/17/25, 1:40 PM with 6 comments
by kcrwfrd_ on 4/17/25, 7:37 PM
by jeremy_k on 4/17/25, 10:28 PM
Example: main -> Branch A -> Lots of commits on A -> Branch B -> Lots of commits on B
Now we squash and merge A into main. B now has all of A's commit history, plus some of its own, instead of just it's own. Rebasing main in causes a lot of conflicts.
by ecesena on 4/18/25, 3:34 AM