KDE

5407 readers

310 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

carlschwan@lemmy.kde.social

Bro666@lemmy.kde.social

herzenschein@pawb.social

Aniqakhokhar@lemmy.kde.social

question about gitlab merge request (invent.kde.org) (lemmy.kde.social)

submitted 1 year ago by tubbadu@lemmy.kde.social to c/kde@lemmy.kde.social

12 comments fedilink hide all child comments

Hello! Yesterday I submitted my first merge request to a KDE software! I forked the repo, applied the edits, committed them and pushed to my fork, and then from gitlab created a merge request. after a few hours, the author pushed something into the master, making my merge request 1 commit behind the master. On the merge request details page, I now get this error:

Merge blocked: the source branch must be rebased onto the target branch.  [rebase without pipeline]  [rebase]

If I try to click on [rebase], I get this red error:

Source branch is protected from force push

what should I do to make my merge request "mergeable" again?

you are viewing a single comment's thread
view the rest of the comments

[–] louis_sch@lemmy.kde.social 3 points 1 year ago* (last edited 1 year ago)

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