Github desktop is such a hot mess that I instead choose to continue to suffer with SourceTree. Sourcetree annoys me for reasons I still cannot articulate after a decade, but it at least tends to actually work without being too intrusive as far as updating, doesn't randomly derp out on credentials, and is super handy when trying to visualize janky branch patterns of dev teams.

Just use Sublime Merge, it's probably the best GUI for Git there is.

Here try one of the others:

https://git-scm.com/tools/guis

GitKraken has been good in my experience with it for many years