lazygit.nvim VS git-conflict.nvim

There is even a plugin for Vim, that lets you open it in a floating overlay. https://github.com/kdheepak/lazygit.nvim

there's a lazygit plugin if you want to skip the step of opening Toggleterm

I really like this lazygit integration: https://github.com/kdheepak/lazygit.nvim

So I use https://github.com/kdheepak/lazygit.nvim All of my git workflow is done in lazygit gg opens the float and away I go

I don't use IntelliJ, so, I don't know how it exactly looks like. But I use this: https://github.com/kdheepak/lazygit.nvim

Why not just use lazygit.nvim?

But using vim-floaterm instead of the https://github.com/kdheepak/lazygit.nvim plugin (which mentions a different plugin https://github.com/akinsho/nvim-toggleterm.lua#custom-terminals as an alternative).

Have you heard of lazygit.nvim?

There is also Neovim plugin which can open lazygit in a floating window. Files will be opened in the active Neovim instance.

https://github.com/kdheepak/lazygit.nvim

git-conflicts.nvim plugin provides highlighting for conflict markers.

I use akinsho/git-conflict and it does its job: minimal and efficient.

git-conflict that puts at your disposal straightforward interfaces to solve merge conflicts

It offers a number of preset layouts, including three variations on a 3-way diff layout, one 4-way diff layout as well as a one plain single window layout (for when you prefer editing the conflict markers manually without the visual noise from diffs, or you're using something like git-conflict.nvim).

Maybe give https://github.com/akinsho/git-conflict.nvim a try, another alternative could be fugitive by tpope iirc.