It’s hard to say what the issue is since we are lacking some context. Have you made changes and commits after the commit you are trying to revert, or was that commit the most recent commit in the history?

Same with the fixes you mention, what exactly did you do to fix the merge conflict? Did you manually fix the files with the conflicts? Since you mention being a beginner with git, a common mistake would be not actually going into the files and resolving the conflicts, and just immediately doing git add/rm on the conflicting files.

I’m happy to walk you through the process if you could give a few more details, git can be complicated when you’re a beginner :)

With a name like TrollAccount69, maybe they’re trying to see if you have limited context window :p

(Not that i’m calling you a bot, but this would be funny way to find out if you were)

Best option right now are to use the following protocol extensions

https://wayland.app/protocols/xdg-activation-v1 this extension covers your setting focus needs, but getting a list of other wayland clients is a bit trickier.

https://wayland.app/protocols/ext-foreign-toplevel-list-v1 this extension can list clients in theory, but its missing support for both gnome and kde.

Some of the unstable extensions have wide adoption, so perhaps take a look at each of them to see if they provide the functionality you want. Good luck!

Edit: was curious and did some more digging. KDE has their own protocol extension for this https://wayland.app/protocols/kde-plasma-window-management

As for gnome, I couldn’t find anything that seemed suitable, other than writing a gnome extension specifically to support this. I imagine that doesn’t fit within your vision for your project though.

Anyway, I had fun looking into this. Once again good luck!

Love the message, but personally I won’t use software written by LLMs.

Well it sounds like you have things back in control with the parental controls gone, so if you haven’t already I would uninstall the play store, and Files by google. You can check out a file manager such as Fossify File Manager as a replacement.

The last part does sound a bit concerning though, you aren’t running an actual FTP server from your phone are you? I would recommend not doing that if you are, as FTP famously doesn’t encrypt traffic. If you need to move files between your phone and a computer, I would recommend using sftp instead and having the sftp server run on your PC.

You can use something termux on android to connect to your pc over ssh, as well as sftp.

“ChatGPT, write a ragebait rant about how everyone should just use mpv instead of jellyfin.”

I wouldn’t be surprised if I even nailed the wording of the prompt.

I understood what you meant, I was just pointing out that what you said was incorrect. Even in your reply you said

I compress my files with the compression that encrypts it.

Which is still not entirely correct. The compression is not doing any encrypting. They are two separate processes that the tool you are using is presenting as a single step for convenience. You seem to know what you are talking about, and I happen to know about cryptography, but as someone else in the thread mentioned not everyone knows how these things work. If we are trying to spread knowledge and tips in this community (like your post is doing) then I just saw this as an opportunity to clarify something that was incorrect. Not for your benefit, but for others.

AES-256 is just an encryption algorithm, it doesn’t do any compression on it’s own, so it’s not quite right to say its compressed with it. Really it was compressed, then afterwards encrypted with AES-256.