Patch Set 1: > If I push the "submit" button here, gerrit (on a black screen) > fails with: > > Code Review - Error > Cannot merge 6f615241665a8c47500855e2d608cab4467e6443 > Missing dependency
I think that happens when you try to merge a commit in a branch with parent commits already merged. Not sure what's the best solution to fix this, I remember running into this a while ago and afair since then I just wait to have all the commits approved, then press "submit including parents" on the last commit in the branch. You may need to rebase it using the web UI or manually rebase + push on your PC, but let's see if somebody else knows better. -- To view, visit https://gerrit.osmocom.org/3428 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I59af60fa89cd10ae973c5e122789e3e03e3728ee Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pablo Neira Ayuso <pa...@gnumonks.org> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Holger Freyther <hol...@freyther.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte <ke...@rhizomatica.org> Gerrit-Reviewer: Neels Hofmeyr <nhofm...@sysmocom.de> Gerrit-Reviewer: Pablo Neira Ayuso <pa...@gnumonks.org> Gerrit-Reviewer: Pau Espin Pedrol <pes...@sysmocom.de> Gerrit-HasComments: No
