On Tue, May 31, 2016 at 12:00:26PM +0200, Neels Hofmeyr wrote: > I did that and submitted two test branches with two commits each: > > One should not have any conflicts during a rebase: > https://gerrit.osmocom.org/130 > https://gerrit.osmocom.org/131 > > The other should have a conflict on the first commit: > https://gerrit.osmocom.org/132 > https://gerrit.osmocom.org/133 > > For some reason both the second commits on the branches also show a > conflict. > > changed back to 'cherry pick' for now.
Did another branch commit without conflict in cherry pick mode, and the commits show as "Related" but not "Submitted together"... That's not news I guess. ~Neels
signature.asc
Description: Digital signature
