Visual Studio Code isn't too bad at this, IMO.Kuchigakatai wrote: ↑Sun Oct 18, 2020 5:54 pm That said, I continue to be dismayed by GUI tools for resolving git conflicts. Is there anything better than vimdiff yet? I need at least four simultaneous screens (the base common ancestor file, the local file, the remote file, and the edited merged file; I find most GUI tools omit the base common ancestor!).
On the GUI vs. CLI debate, it mostly depends on what you're doing most often. At work, I build and run development environment, sometimes I lend a hand to developers, and I package apps for production.
Most of that should ideally be automated, and in any case, it needs to be repeatable. You can't really beat CLI tools for that.
I'm also amused at the way our production teams buy overpriced toy. We have some huge Big Data(TM) thing for logs, for instance; in reality most if not all of our needs are covered by good-old fashioned grepping and awking.