@mokazemi@discuss.tchncs.de avatar

mokazemi

@[email protected]

This profile is from a federated server and may be incomplete. View on remote instance

mokazemi ,
@mokazemi@discuss.tchncs.de avatar

You also need a license key XD

mokazemi ,
@mokazemi@discuss.tchncs.de avatar

That’s what I was thinking about, too. Deleting all dotfiles related to KDE stuff.

mokazemi ,
@mokazemi@discuss.tchncs.de avatar

Unfortunately you can’t install Firefox deb in Ubuntu anymore (just like chromium). Canonical doing sh*t!

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

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...

mokazemi ,
@mokazemi@discuss.tchncs.de avatar

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


<span style="color:#323232;">git checkout master
</span><span style="color:#323232;">git pull origin master
</span><span style="color:#323232;">git checkout yourbranch
</span><span style="color:#323232;">git rebase master
</span><span style="color:#323232;">git push -f origin yourbranch 
</span>

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


<span style="color:#323232;">git merge master
</span><span style="color:#323232;">git push origin yourbranch 
</span>
mokazemi ,
@mokazemi@discuss.tchncs.de avatar

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.

mokazemi ,
@mokazemi@discuss.tchncs.de avatar

Mmm… And what if it had conflict and I got error?

  • All
  • Subscribed
  • Moderated
  • Favorites
  • •
  • random
  • All magazines
    •