diffconflicts VS lazygit.nvim

diffconflicts [dc] lets you resolve diffs as a two way diff between what's in the conflict markers instead of including the resolved parts in the diff. It opens the diff in vim but could be adapted for other editors. Verbose explanation: https://github.com/whiteinge/diffconflicts/blob/master/READM...

The author converted it to a vim plugin with the same name, but I use a different vim plugin implementation [mergetool].

[dc]: https://github.com/whiteinge/dotfiles/blob/master/bin/diffco...

I like vim-mergetool for merging in vim. It's inspired by the diffconflicts method (but written in vimscript): Diff the resolved conflicts instead of a three way diff with base. You can also switch to three way with :MergetoolToggleLayout LmR too, but I usually only switch to diffing resolved against theirs or ours.

https://github.com/whiteinge/diffconflicts as a merge tool

https://github.com/whiteinge/diffconflicts is not unknown, but I think deserves way more attention. It transforms the way you resolve merge conflicts unlike any other tool I've seen.

For resolving conflicts, I like https://github.com/whiteinge/diffconflicts. It's really good at cutting the noise from conflict markers and only showing what matters.

For resolving conflicts I recommend https://github.com/whiteinge/diffconflicts, the demo video explains it best https://www.youtube.com/watch?v=Pxgl3Wtf78Y.

have you tried diffconflicts? started using it ages ago, might be worth checking out if you get tired of editing by hand.

I end up using https://github.com/whiteinge/diffconflicts it does the job I have looked for, I have adjusted the way it a bit to look more like 3 splits solver rather with 2 splits.

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