Web Edit creates branch from wrong origin
I got emailed that my merge request can not be no longer merged:
-
gitlab-org/cluster-integration/auto-build-image!54 (closed), it shows
The source branch is 8 commits behind the target branch
as there's no interactive way to resolve this problem from the web, and the change was rather simple, I decided to recreate the change.
- I went to https://gitlab.com/gitlab-org/cluster-integration/auto-build-image
- choose Dockerfile: https://gitlab.com/gitlab-org/cluster-integration/auto-build-image/-/blob/master/Dockerfile
- clicked edit: https://gitlab.com/gitlab-org/cluster-integration/auto-build-image/-/edit/master/Dockerfile
- on save I got error: "Someone edited the file the same time you did. Please check out the file and make sure your changes will not unintentionally remove theirs."
- I opened the link that "the file" linked to: https://gitlab.com/gitlab-org/cluster-integration/auto-build-image/-/blob/glensc-master-patch-46381/Dockerfile
- the link is 404
- retry did not help
- could not complete edit from simple edit
So, I assumed simple edit is broken and retried the same with web ide:
- I went to https://gitlab.com/gitlab-org/cluster-integration/auto-build-image
- chose Dockerfile: https://gitlab.com/gitlab-org/cluster-integration/auto-build-image/-/blob/master/Dockerfile
- clicked Web IDE: https://gitlab.com/-/ide/project/glensc/auto-build-image/edit/master/-/Dockerfile
- made the change, committed, made merge request: gitlab-org/cluster-integration/auto-build-image!57 (closed)
- but this was not created from fresh master, it's also
The source branch is 8 commits behind the target branch
so what seems to be happening is that it takes my fork master branch as base, not as the original project master branch, even I was on master branch of the original project.
the difference here is that web edit I could not complete the action, web ide, I was able to complete, but it created from stale version of master branch.
screenshots for posterity
ps: for screenshotting purposes would be useful if the branch name could be shown fully, either by clicking on the thee dots or having a tooltip