4 ms·
You can have both. A merge has two parents so one parent is the main branch minus this squashed commit, and the other parent leads to the commits made during de
by nabogh 4y ago
You can have both. A merge has two parents so one parent is the main branch minus this squashed commit, and the other parent leads to the commits made during development. It's the default behaviour that I've seen everywhere.
- thriftwy 4y agogit bisect basically refuses to work with merge commits, so using those ruin bisectability. As well as linear log, cherry-pick and scores of other tools which do not have intelligent merges handling.
- Karellen 4y ago> git bisect basically refuses to work with merge commits, so using those ruin bisectability. I find that quite surprising, given how I see `git bisect` referenced by the Linux community as useful for tracking down the commit that introduced a problem, and Linus uses merge commits (including `octopus merges`) very heavily.