conflict-marker.vim VS lazygit.nvim

For merge conflicts, https://github.com/rhysd/conflict-marker.vim is so much easier to use than any any other diff tool.

To all plugin devs, sometimes highlighting the conflict markers would be great. I would like a similar workflow like in vscode. The closest I found was the following, but unfortunately it's hard to get it to work with a modern color scheme. See the following issue.

I use this plugin: https://github.com/rhysd/conflict-marker.vim

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