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:18:13 UTC 2016


On Tue, May 31, 2016 at 12:00:26PM +0200, Neels Hofmeyr wrote:
> One should not have any conflicts during a rebase:
> https://gerrit.osmocom.org/130
> https://gerrit.osmocom.org/131

There's a conflict on 131 that shouldn't happen. Does anyone know how to
see gerrit's problem with this commit?

~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/7a20f02e/attachment.bin>


More information about the OpenBSC mailing list