To be fair that’s not the entire story, since you need to actually resolve the conflicts first, which is slightly scary since your worktree will be broken while you do it and your Linter will be shouting at you.

You may also want a dedicated merge tool that warns you before accidentally commiting a conflict and creating a broken commit.

Oh and non trivial resolutions may or may not create an evil merge which may or may not be desirable depending on which subset of git automation features you use.

Using git status often is definitely good advice though.

I’m running KDE Plasma with the revived Krohnkite for auto tiling. Plasma 6.2 seems to have fixed most of the bugs from 6.0 and 6.1, at least the ones I’ve noticed.

I was using Sway/SwayFX for a few months but was missing some KDE Gear apps like Dolphin and Okular which I couldn’t get to display correctly. KDE is afaik the only desktop with a working Qt theming engine right now, so I can’t really see myself switching (unless maybe if they break Krohnkite again).