Rebasing other users' MRs for packages
Not sure if this is intentional but trying to rebase the branch in this MR is giving me a "something went wrong": https://gitlab.archlinux.org/archlinux/packaging/packages/sway/-/merge_reque... I would guess that the person just didn't check the "let the maintainer edit the commits" or something but I'd expect a less generic error message. Is this intentional behavior or broken behavior?
On 07.01.24 at 18:30 (UTC-0800), Brett Cornwall wrote:
Not sure if this is intentional but trying to rebase the branch in this MR is giving me a "something went wrong": https://gitlab.archlinux.org/archlinux/packaging/packages/sway/-/merge_reque...
I would guess that the person just didn't check the "let the maintainer edit the commits" or something but I'd expect a less generic error message. Is this intentional behavior or broken behavior?
It is likely that the source `main` branch in their fork is protected, so even they would not be able to rebase and force-push the rewritten history. Jakub
On 2024-01-07 18:30:32 (-0800), Brett Cornwall wrote:
Not sure if this is intentional but trying to rebase the branch in this MR is giving me a "something went wrong": https://gitlab.archlinux.org/archlinux/packaging/packages/sway/-/merge_reque...
I would guess that the person just didn't check the "let the maintainer edit the commits" or something but I'd expect a less generic error message. Is this intentional behavior or broken behavior?
Ah yes, the "merge request from default branch" problem :S I have just extended the merge request guidelines for this in the general guidelines so hopefully we will see this less going forward: https://wiki.archlinux.org/index.php?title=General_guidelines&diff=prev&oldid=796664 To fix your issue at hand right away and preserve the author attribution, you may just cherry-pick the relevant commit onto the default branch: https://gitlab.archlinux.org/yrlf/sway/-/commit/e6a592c9d59ecbec5b5f89be989b... ```shell $ git cherry-pick -S e6a592c9d59ecbec5b5f89be989b8cc6e1072822 ``` And afterwards just close the MR with a note :) Best, David -- https://sleepmap.de
participants (3)
-
Brett Cornwall
-
David Runge
-
Jakub Klinkovský