31 May
2016
31 May
'16
1:18 p.m.
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