22 May
2016
22 May
'16
6:39 p.m.
On 22 May 2016, at 18:28, Neels Hofmeyr
<nhofmeyr(a)sysmocom.de> wrote:
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?
no idea. But in general:
* the patch has a parent hat is not in master
* I have configured to use "cherry-pick" (as we don't want to have tons of
merges just because we merge some older patchset). Maybe it interacts badly with your
case?
The modes are described here:
https://gerrit-review.googlesource.com/Documentation/project-configuration.…