mokazemi

joined 2 years ago
[–] mokazemi@discuss.tchncs.de 11 points 2 years ago

Subtitle composer can do that: https://subtitlecomposer.kde.org/

Also Kdenlive has a feature for it as I know, though I never tested: https://docs.kdenlive.org/en/effects_and_compositions/speech_to_text.html

[–] mokazemi@discuss.tchncs.de 1 points 2 years ago (1 children)

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

[–] mokazemi@discuss.tchncs.de 1 points 2 years ago (3 children)

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@discuss.tchncs.de 9 points 2 years ago (1 children)

I also like Kate. I use it for Python, Html/css and some other stuff. I really like it since it's light and fast but full of features. Also integrates well with my desktop.

[–] mokazemi@discuss.tchncs.de 1 points 2 years ago (5 children)

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 
[–] mokazemi@discuss.tchncs.de 5 points 2 years ago* (last edited 2 years ago)

Yes. Manjaro is a so unsable and garbage (for many reasons). Though Arch (EndeavourOS in my case) has been a lot stable for me due to my experience.

[–] mokazemi@discuss.tchncs.de 4 points 2 years ago

Wow :) Thanks. Can't wait to see these improvements onboard

[–] mokazemi@discuss.tchncs.de 1 points 2 years ago

Zotero is actually a paper and reference manager. Pocket is more like a bookmark manager. Though it's really good for those citation management usages 👌

[–] mokazemi@discuss.tchncs.de 1 points 2 years ago

What was that vulnerability and how it's related to Libreoffice? I thought it's just about browsers 🤔

view more: ‹ prev next ›