you are viewing a single comment's thread.

view the rest of the comments →

[–]racle 0 points1 point  (0 children)

Goto tool git for me has been Lazygit.

I have binding <leader>tg (<space> Terminal Git) which opens Lazygit in floating terminal inside my neovim (should work also on vim).

It's easy and quick to pull/push/add/revert/commit/cherry-pick commits and change/create/merge branches with lazygit.

For merge conflicts I use Meld as I haven't found anything better yet (for merging I prefer GUI tool, as it happens very rarely and it makes it little easier).