@b0rk for me, VSCode is the GUI of choice, probably 50:50 split with the git CLI - plus occasional merge conflict resolution via the GH web UI