I’m wondering if you use any (graphical) clients to manage your Git, and if so, what client you use.
I myself have to use git professionally across all 3 major OS-es, and I currently use Sourcetree on Windows and macOS, and the Git tools built-in into IntelliJ on Linux.
Have given MaGit a try, but just couldn’t get all the shortcuts to stick in my mind.
Interested to hear your experiences!
I still don’t think it’s nearly as convenient as being able to just see the changes side by side and click the one you want (or both). You can even easily modify the final outcome in the 3rd preview panel, in case you need to do a quick fix after a conflict resolution.