| @michelthebeau:matrix.org | @fungi could you help find someone to help look at why zuul is not merging, this in particular: https://review.opendev.org/c/starlingx/update/+/991681 | 13:30 |
|---|---|---|
| At first it was stuck at not checking, gating, and/or promoting, but now it’s sitting at “ready to submit” | ||
| @fungicide:matrix.org | michelthebeau: rebase it, the parent change got revised before it was merged, so the current git parent commit doesn't exist in the branch history (and never will) | 14:05 |
| @fungicide:matrix.org | indicated by the orange "(Merged, not current)" next to the parent in the relation chain box at the top-right of the screen | 14:05 |
| @michelthebeau:matrix.org | @fungi … I should have noticed that, sorry for the unnecessary ping | 14:29 |
| @michelthebeau:matrix.org | Ty | 14:30 |
| @fungicide:matrix.org | no need to apologize, i know the ui is not the most intuitive in places | 14:32 |
| @fungicide:matrix.org | it's just become the first thing i look for when people say they don't know why a change isn't merging | 14:32 |
| @fungicide:matrix.org | usually if i'm revising a change in a series i'll rebase all the later changes on it at the same time and push them all back up together, but it's easy to forget | 14:33 |
| @michelthebeau:matrix.org | I was using my phone mostly too, so not as easy to see the orange line | 14:41 |
| @fungicide:matrix.org | i can believe that. also i can't imagine trying to do code review on a smartphone, impressive! | 14:44 |
Generated by irclog2html.py 4.1.0 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!