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(a)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