* one integration branch for trivial/non-conflicting merge results * optional slice branches for selected conflicted files * original annotate/blame information is retained
Doesn't this mean the integration branch will be missing key updates, thus it's expected to be broken?