Gerrit and Jenkins: merge conflict vs. +1 Verified

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
Wed Jun 1 10:53:46 UTC 2016


On Tue, May 31, 2016 at 11:25:38AM +0000, lynxis lazus wrote:
> Review at  https://gerrit.osmocom.org/145

I'm confused. Gerrit says this change could not be merged. Then how on earth
can Jenkins add a +1 for a successful build to it??

Something about these gerrit merge conflicts is completely wrong. I'd
appreciate if we could clarify this. Any ideas on how to find out?

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


More information about the OpenBSC mailing list