4 ms·
I used to be a big proponent of rebase+squash, but migrated everyone to merge+no-ff. I needed the previous commit to be easily accessible for CI purposes, and m
by orthoxerox 4y ago
I used to be a big proponent of rebase+squash, but migrated everyone to merge+no-ff. I needed the previous commit to be easily accessible for CI purposes, and merge+no-ff gives it to you without the additional hassle of rebasing.
- djmips 4y agoCan you expand on what merge+no-ff means?
- smegsicle 4y agoi think it just means turning off merge fast-forwarding (git merge --no-ff, or config merge.ff=false) so that merges appear as explicit commits even when one side of the merge has no commits, where git would by default just zip them together making it appear as though no merge happened at all less work than dealing with squashing, and easier to understand past branches than the default