26 Oct 2023 |
stigo | Would you like me to re-target the PR to staging-next? | 12:01:09 |
vcunat | Yes, if you're merging, switch the target in the UI before that. | 12:02:09 |
vcunat | (no git operation should be necessary) | 12:02:19 |
stigo | .. thankfully. I'm happy to remove my "upstreamWRITE" git remote | 12:03:00 |
vcunat | There's a conflict though. | 12:03:38 |
stigo | I'll merge in staging-next first | 12:03:52 |
stigo | * I'll merge in staging-next to perl-updates first and fix any issues | 12:04:03 |
Janne Heß | I can do a final review (and merge? If you don't want the honor for yourself ;) if you want to | 12:04:32 |
stigo | In reply to @janne.hess:helsinki-systems.de I can do a final review (and merge? If you don't want the honor for yourself ;) if you want to That would be great :) | 12:04:41 |
Janne Heß | Ping me once you have pushed ;) | 12:06:53 |
stigo | Conflicts resolved, going to do some sanity checks before pinging you Janne Heß | 12:10:33 |
stigo | Just love how changing base branch almost always pings all CODEOWNERS... | 12:15:36 |
vcunat | I didn't think it would happen here. But IIRC an easy way is to mark as draft, then retarget and mark as ready. | 12:17:47 |
stigo | In reply to @vcunat:matrix.org I didn't think it would happen here. But IIRC an easy way is to mark as draft, then retarget and mark as ready. Good tip, thx | 12:18:09 |
Janne Heß | stigo: You wanna press the big green button? | 12:30:14 |
Janne Heß | *gray | 12:30:17 |
Janne Heß | In reply to @stigo:matrix.org Conflicts resolved, going to do some sanity checks before pinging you Janne Heß
before pinging you proceeds to ping me in the same message refuses to elaborate
| 12:30:45 |
Janne Heß | In reply to @stigo:matrix.org Conflicts resolved, going to do some sanity checks before pinging you Janne Heß *
"before pinging you" proceeds to ping me in the same message refuses to elaborate
| 12:30:48 |