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
this post was submitted on 06 Oct 2023
13 points (93.3% liked)
KDE
5338 readers
53 users here now
KDE is an international technology team creating user-friendly free and open source software for desktop and portable computing. KDE’s software runs on GNU/Linux, BSD and other operating systems, including Windows.
Plasma 6 Bugs
If you encounter a bug, proceed to https://bugs.kde.org/, check whether it has been reported.
If it hasn't, report it yourself.
PLEASE THINK CAREFULLY BEFORE POSTING HERE.
Developers do not look for reports on social media, so they will not see it and all it does is clutter up the feed.
founded 1 year ago
MODERATORS
Here's a good guide, in the gitlab documentation.
Presumably, your merge request is about merging your fork master branch into the upstream master branch, right?
In that case, you have two options:
- Go into the Gitlab settings of your fork, find the setting where branches are protected and disable the protection for your master branch
- (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
@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
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
No! Bad dev! No biscuit!
Never merge master into a feature branch. It's called a "wrong-way" merge and it makes the history fucking awful.
You shit in the face of project maintainers when you do this.
You may not care, in fact many don't. Also people buy timeshares, read celebrity gossip magazines, and vote for scumbags. They are fucking idiots who don't know what they are doing. So are people who leave wrong-way merges in shared history.
In fact, wrong-way mergers are worse, because you can't just ignore them - git blame rubs your face in their shit, so they shit in your face forever.
Just don't fucking do it, OK? Or I will hit you in the throat with a cricket bat soaked in wasps. As a first warning.
Not an issue if you're squashing commits before merging into master though, right?
Sure I promise not to do it anymore. Calm down. Take a deep breath at first! :)) Could you explain the right way to do it? I'm not expert in using git. Explain the correct way to deal with the situation.
Your first way was the right way, rebasing
Mmm... And what if it had conflict and I got error?
Resolve those conflicts !
Thanks to everyone for the answers!