GUI

[naturallymitchell]

https://versionsapp.com/

https://kaleidoscope.app/

Meld

Gentoo portage ncurses 3 way merge

https://css-tricks.com/merge-conflicts-what-they-are-and-how-to-deal-with-them/

[naturallymitchell]

general commands/actions: https://cli.github.com/