![](https://discuss.tchncs.de/pictrs/image/f962623e-88c9-48e6-ab09-5570cbed22db.png)
![](https://lemmy.kde.social/pictrs/image/19e6d51f-5131-409e-8990-827d3d29e4d3.png)
2·
5 months agoThat’s what I was thinking about, too. Deleting all dotfiles related to KDE stuff.
That’s what I was thinking about, too. Deleting all dotfiles related to KDE stuff.
Unfortunately you can’t install Firefox deb in Ubuntu anymore (just like chromium). Canonical doing sh*t!
Mmm… And what if it had conflict and I got error?
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.
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
You also need a license key XD