vim-swap VS diffconflicts

Only one I use that hasn't been mentioned is a standalone vim-swap replacement. The existing ones all need treesitter (that I know of)

vim-swap provides an easy way to swap delimited items. It also provides textobjects targeting them, so deleting an argument becomes as easy as da,

I use this feature right now, and it simplifies a lot. I use t to open tabmode so I can create or destroy tabs easily. b, which I use more often, opens bufmode so I can switch the buffer in the current window, or delete it while preserving my layout. gs allows me to swap delimited items using hjkl. w is for visually switching between open splits. Etc etc

I recommend machakann/vim-swap. This plugin provides the way to swap function parameters, and text-objects that can be used to select parameters:

I've been using vim-swap for a while and it's simple enough: when on top of a delimited argument, you can hit g> or g< to swap right or left, respectively.

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.