Issues rebasing other people's branches
skunnyk at alteroot.org
Tue Oct 18 10:39:02 CEST 2022
Yep, maybe something changed in gitlab (haven't checked in details)!
You are now "Maintainer" of xfburn, you should be able to rebase and merge :)
October 18, 2022 at 8:57 AM, "Gaël Bonithon" wrote:
> Hi Hunter,
> It seems to me that before you could rebase merge requests as a developer, and that's what the doc says  (force push to non-protected branches). But apparently you can't anymore: I've tried on components where I'm a developer and I can't, yet there's no conflict (otherwise the message is different), and I'm pretty sure the branch is unprotected (recent requests not made on master).
>  https://gitlab.xfce.org/help/user/permissions.md
> ------- Original Message -------
> On Tuesday, October 18th, 2022 at 3:32 AM, Hunter Turcin <huntertur at gmail.com> wrote:
> > Hello again :)
> > I was recently given Developer permissions on the Xfburn repository and
> > had a question about the current preferred workflow for rebasing
> > changes in a merge request before merging.
> > I see that the GitLab instance is configured to require a rebase of the
> > source branch onto the target branch before a merge can be performed in
> > the UI. I am able to perform the rebase through the UI when I own the
> > branch in the merge request (), but when I attempt to do the same
> > for merge requests involving branches I don't own (, , ), I
> > get an error. The UI says "Something went wrong. Please try again."
> > Normally I would assume this is due to me not having permissio to
> > write to the source branch (which I can confirm I don't when attempting
> > to rebase and then push to the source branch manually outside of the
> > GitLab UI), but I notice that the error is preceded by a request to
> > https://gitlab.xfce.org/apps/xfburn/-/merge_requests/null?skip_ci=false
> > which does not seem right (specifically, the merge request number being
> > null).
> > I would like to confirm: is the behavior of not being able to rebase
> > branches I don't own through the UI expected?
> > Thanks,
> > Hunter Turcin
> > : https://gitlab.xfce.org/apps/xfburn/-/merge_requests/11
> > : https://gitlab.xfce.org/apps/xfburn/-/merge_requests/13
> > : https://gitlab.xfce.org/apps/xfburn/-/merge_requests/12
> > : https://gitlab.xfce.org/apps/xfburn/-/merge_requests/10
> > _______________________________________________
> > Xfce4-dev mailing list
> > Xfce4-dev at xfce.org
> > https://mail.xfce.org/mailman/listinfo/xfce4-dev
> Xfce4-dev mailing list
> Xfce4-dev at xfce.org
More information about the Xfce4-dev