Today, gerrit has merged four of my changesets twice for some reason (even though they had the very same Change-Id), meaning that openbsc.git master got four empty commits.
It could end up being a stupid thing to do, but I thought if at all then right now and no later: I forced master HEAD back so that we don't have empty commits in it, back to d1c0e3755f2832270a16bdb2d350463409cad887.
I apologize in advance for any inconvenience caused. If you need help to recover from a diverged master branch, don't hesitate to ask!
~Neels
Great, osmo-bts.git also has some empty revisions. They are not at master's tip, so I'm leaving those.
Gerrit was causing trouble today when I wanted to merge a branch, and I tried to reapply a patch that had fixed branch submission earlier. I hope that patch caused the faulty submissions. I have put plain gerrit back without the patch.
~Neels
On Mon, Jul 25, 2016 at 09:59:13PM +0200, Neels Hofmeyr wrote:
Today, gerrit has merged four of my changesets twice for some reason (even though they had the very same Change-Id), meaning that openbsc.git master got four empty commits.
It could end up being a stupid thing to do, but I thought if at all then right now and no later: I forced master HEAD back so that we don't have empty commits in it, back to d1c0e3755f2832270a16bdb2d350463409cad887.
I apologize in advance for any inconvenience caused. If you need help to recover from a diverged master branch, don't hesitate to ask!
~Neels
--
- Neels Hofmeyr nhofmeyr@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: Harald Welte
-
Neels Hofmeyr