Which tools do you use for Git Conflicts?

1

fugitive (via vim)

I use https://github.com/lewis6991/gitsigns.nvim for checking changes in the code, and use https://github.com/tpope/vim-fugitive to run git commands (add, commit, push, etc) without leaving neovim.

#Git #Git Tools #Code Collaboration 69 social mentions

2

tmux

Leave the editor? I'im using Floaterm to quick access to shell. Beside, I have Tmux covered too.

#SSH #Terminal Tools #Server Management 26 social mentions