2 ms·
When cleaning up my own feature branch for review git merge —-squash <tree-ish> When merging into the baseline git merge —-no-ff <tree-ish> The reas
by gbacon 7y ago
When cleaning up my own feature branch for review
git merge —-squash <tree-ish>
When merging into the baseline
git merge —-no-ff <tree-ish>
The reason for the latter is subtle. Yes, a perfectly linear history is nice in the aesthetic sense. However, the merge commits are artifacts of reviews that are useful in process audits, which QA and QC like to preserve.