CODEWITHSUNDEEP
gitgitlabrebasemerge-conflict-resolutionweb-ide
Chapmacl
Chapmacl

Reputation: 181

How to merge master to feature-branch only using Gitlab GUI/Web IDE?

Maybe an odd situation, but I have fiddled with this myself and searched several forums without any luck. Is this even possible without setting up a local environment and cloning the repo?

For some context: In our company, we have several non-devs who make small updates to a project using the Web IDE from Gitlab. From time to time, they will need to update their feature branch with new changes from master before being able to merge. I never imagined that doing something like this would prove to be so difficult, especially considering how important this step can be.

I know how to do this with git commands in a terminal, but in order to even use the terminal in Gitlab's Web IDE you first need to setup a remote environment.

I also know that several popular IDEs allow users to do this with simple button clicks, but we would like to avoid having to setup local environments for all of our end-users and forcing them to change their workflow for something that they only need to use a few times a month.

Upvotes: 0

Views: 731

Answers (1)

knittl
knittl

Reputation: 265727

Maybe GitLab quick actions could help in your case. In your merge request, type /rebase in the comment field and submit (either by clicking the submit button or by pressing Ctrl-Enter). Given that there are no conflicts, the branch will be rebased onto the target branch of the merge request. If there are conflicts however, your only choice is to rebase (or merge) locally to resolve the conflicts.

Upvotes: 1

Related Questions