winshift.nvim VS diffconflicts

winshift.nvim adds a "move windows around"-mode.

Check out winshift.nvim (https://github.com/sindrets/winshift.nvim) and combine it with hydra.nvim (https://github.com/anuvyklack/hydra.nvim | https://github.com/anuvyklack/hydra.nvim/wiki/Windows-and-buffers-management )

I tried the plugin Winshift to move windows around and put Aerial below Nvim-tree, and it works well!

Well, according to my experience by ctrl-w H|J|K|L I was able to adapt 4 window into whatever I wanted. Mostly it was enough for my workflow (since I'm also switching buffers or sometimes I'm using tabs) For more windows I occasionally use https://github.com/sindrets/winshift.nvim but it is only for neovim and I'm not aware of alternatives for pure vim.

Definitely gonna give this plugin a try! I would also recommend checking out winshift.nvim which adds a "move windows around" mode which is also way more intuitive than Vim's own way of moving windows around.

winshift.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.