KDE

Presumably, your merge request is about merging your fork master branch into the upstream master branch, right?

In that case, you have two options:

1. Go into the Gitlab settings of your fork, find the setting where branches are protected and disable the protection for your master branch
2. (the recommended way, at least for future merge requests) always create a feature branch, never work on master in the first place. You can create a branch from what you have right now on the command line with git checkout -b featurename. Then push that branch and create a new merge request for it

Basicly :

• go to your locale repo
• git checkout master
• git pull
• git checkout 'your feature branch'
• git rebase master

And then you'll maybe have to resolve merge conflicts

They're a ton of guide showing how to deal with this if you need

Here's a good guide, in the gitlab documentation.

https://docs.gitlab.com/ee/topics/git/git_rebase.html

@tubbadu as other said, you should not create a PR from your master branch. You can still change the source of your PR using gitlab web UI (at least I think you can change after the initial creation. You may also temporarily remove the branch protection from the master branch using gitlab web UI in the repo setting to move this specific PR forward

Thanks to everyone for the answers!

I guess you should rebase or merge the Master branch into your branch and then push again:

git checkout master
git pull origin master
git checkout yourbranch
git rebase master
git push -f origin yourbranch 

But if you got error since that new commit has conflict with your chances:

git merge master
git push origin yourbranch