Gerrit and branches

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/OpenBSC@lists.osmocom.org/.

Neels Hofmeyr nhofmeyr at sysmocom.de
Tue May 31 10:14:08 UTC 2016


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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20160531/9bf2a282/attachment.bin>


More information about the OpenBSC mailing list