Comment by keyle

Comment by keyle 17 hours ago

2 replies

Lazygit is great, I use it all the time for straight forward git-fu.

I do recommend turning off force push (there is an option), as it's easy to fat finger and leads to a whole lot of heartache.

But if you do any advanced work that involves merging a complex codebase across multiple branches, with generated code and multiple languages; and having to manage your load of conflicts, I find Fork[1] (the free version does fine) still takes the cake for that, as the clarity and lack of keyboard bindings, is essential; to make good, conscious decisions.

[1] https://git-fork.com

robin_reala 4 hours ago

To be clear, there isn’t a free version. There’s a cost-less download that’s meant for evaluation purposes, with the goal of paying them if you like it and find yourself using it long-term.

Given that Fork is a two-person family company that’s somehow managed to make the best Git client in the world for a single reasonable price with free updates and no subscription, I’d suggest that it’s worth paying for to keep their business sustainable.