3 ms·

Can you expand on what merge+no-ff means?

• smegsicle 4y ago
  i 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