gerrit: merge conflict?

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
Sun May 22 16:28:53 UTC 2016


My patches https://gerrit.osmocom.org/93 and 94 show as merge conflict in the
overview. Yet when I rebase them onto origin/master, neither has a merge
conflict.

Before 92 was submitted, gerrit said that 93 conflicted with
https://gerrit.osmocom.org/92 which has no overlaps, the changes are more than
60 lines apart.  In the log I also see a jenkins build success.

I have no idea what to make of this. How can I see merge conflicts that gerrit
saw and be less confused?

~Neels

-- 
- Neels Hofmeyr <nhofmeyr at sysmocom.de>          http://www.sysmocom.de/
=======================================================================
* sysmocom - systems for mobile communications GmbH
* Alt-Moabit 93
* 10559 Berlin, Germany
* Sitz / Registered office: Berlin, HRB 134158 B
* Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte
-------------- 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/20160522/5c5204bb/attachment.bin>


More information about the OpenBSC mailing list