3 ms·
If you squash all the merge requests, you get ONLY merge commits.
by aurelianito 6y ago
If you squash all the merge requests, you get ONLY merge commits.
- Droobfest 6y agoThey can both be pretty useful. So keep all commits and decide upon viewing the log which ones you really want to see.
- OJFord 6y agoA 'merge commit' is the commit that ties together two strands. * merge commit |\ | * branch work | | | * branch work |/ * If you squash to merge, typically you're also going to rebase it (equivalently, if it's more familiar, cherry-pick the squash onto the branch your 'merging' it into). * squash cherry-picked / rebased | * both branch works squashed | * | branch work | | | | * | branch work |/_/ * (In this case the target branch could have been fast-forwarded, but this also works if there's some other work on the mean time:) * squash cherry-picked / rebased | * something unrelated | * both branch works squashed | * | branch work | | | | * | branch work |/_/ *
- aurelianito 6y agoI know. It means that the only commits left are the ones that originally where merge requests, and you loose the rest of the history.