[15:07:24] <Matthew_>	 Okay, actual request for that review now :) Just rebased.
[21:47:29] <twentyafterfour>	 ugh, rebase error still?
[21:48:24] <Matthew_>	 Yeah.  Let me try to rebase again.
[21:48:45] <Matthew_>	 It's RELEASE-NOTES-1.30... there's such a small window for that file...
[21:51:01] <Matthew_>	 twentyafterfour: Patch rebased.
[21:52:03] <twentyafterfour>	 +2
[21:53:08] <Matthew_>	 Thank you.  It's reporting a conflict with https://gerrit.wikimedia.org/r/#/c/366872/10 but that doesn't appear to have been merged yet.
[22:10:32] <Matthew_>	 twentyafterfour: Appears it failed phpcs, I'm going to do one more patch set if you don't mind.  I'm sorry I'm still learning my way around here :/ I'm sorry...
[22:10:54] <twentyafterfour>	 Matthew_: sure no problem
[22:13:55] <Matthew_>	 Ok, submitted.  Jenkins likes it so far.
[22:45:33] <twentyafterfour>	 +2 again :)
[22:48:51] <Matthew_>	 Thank you :)
[22:57:24] <twentyafterfour>	 doh another -1
[22:57:26] <twentyafterfour>	 wtf
[22:58:05] <twentyafterfour>	 something must be wrong with jenkins? I don't get it. I mean, why can't it auto-rebase a change to the changelog? it's silly
[22:58:51] <twentyafterfour>	 I think gerrit is confused about the parent revision
[23:00:44] <Matthew_>	 I don't know... I've rebased twice and the last time RELEASE-NOTES-1.30 was touched was over 7 hours ago... I don't know if I'm doing something wrong or what...
[23:01:07] <twentyafterfour>	 Are you rebasing on the tip of head?  I think jenkins is wrong here not you
[23:01:23] <twentyafterfour>	 it's saying your patch is based on a revision that isn't current but that revision is merged
[23:02:05] <twentyafterfour>	 You could try abandoning and submitting a new revision with the change
[23:02:19] <twentyafterfour>	 I have a feeling jenkins is just confused about this one and I don't know why exactly
[23:02:41] <twentyafterfour>	 I mean gerrit
[23:02:44] <twentyafterfour>	 not jenkins
[23:02:46] <twentyafterfour>	 doh
[23:03:09] <twentyafterfour>	 stupid anthropomorphised software
[23:03:16] <twentyafterfour>	 can't keep them straight :_
[23:08:46] <Matthew_>	 Hm... 
[23:09:23] <Matthew_>	 My steps for rebasing are https://www.entropywins.wtf/blog/2013/07/01/resolving-a-merge-conflict-on-gerrit/
[23:10:12] <twentyafterfour>	 yeah but I think gerrit got this one wrong because there doesn't seem to be any real conflict
[23:12:57] <twentyafterfour>	 no I'm wrong, there is a conflict in release notes
[23:12:59] <twentyafterfour>	 hmm
[23:14:42] <Matthew_>	 I'm sorry I don't know...
[23:14:46] <twentyafterfour>	 updated
[23:15:38] <twentyafterfour>	 ok one more time :)
[23:16:08] <paladox>	 twentyafterfour hi
[23:16:18] <twentyafterfour>	 hi
[23:16:21] <paladox>	 i think i know why it's failing for you
[23:16:25] <paladox>	 it's jenkins side
[23:16:39] <paladox>	 this has happened before with repo's
[23:16:42] <twentyafterfour>	 oh??
[23:16:50] <paladox>	 you need to delete the repo on the contint host
[23:16:55] <paladox>	 where zuul clones it
[23:17:03] <twentyafterfour>	 hmm
[23:17:21] <twentyafterfour>	 I thought those were supposed to get regenerated every time
[23:17:58] <paladox>	 Not sure but it has happened before, that's how hashar fixed it :)
[23:18:03] * paladox -> in the car
[23:18:29] <twentyafterfour>	 thanks!
[23:18:44] <paladox>	 your welcome :)
[23:19:07] <paladox>	 seems like it's mw/core so it should be causing all tests to fail
[23:31:22] <Matthew_>	 twentyafterfour: Okay, thank you so much.  It appears to have been merged now...
[23:31:30] <twentyafterfour>	 :)
[23:31:42] <twentyafterfour>	 Sorry gerrit is such a pain
[23:45:10] <Matthew_>	 It's ok.  Thank you for troubleshooting :)