@meuns The idea that I fllow is to make atomic and non-broken commits that keeps things working until the feature is complete. That makes history linear and very easy bisect-able.
@meuns All the merges that we do are fast-forward, which involves a rebase first. Not sure if other people follows this principle too. Normal merges without rebase tends to make history non-linear and harder to bisect.