diffconflicts VS vim-easymotion

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.

vim-easymotion together with space as mapleader (let mapleader = "\" in your .vimrc) can open up a new world for you.

Why not sneak or easymotion?

I'm also on team no remap. I don't use hjkl anymore and instead have a nav layer bound to where hjkl would be when I hold a thumb key down. I also use https://github.com/easymotion/vim-easymotion Bound to norm s.

Incredible that nobody mentioned vim-easymotion - totally necessary for me.

But have you tried https://github.com/easymotion/vim-easymotion (I recommend let mapleader = "\").

By vim motions, do you mean native motions or extended motions with plugins like vim easymotion and vim sneak? Those are the two I've been trying out recently.

Been around since ~2012 via vim-easymotion as well: https://github.com/easymotion/vim-easymotion

I second the suggestion of using a plugin like easymotion. https://github.com/easymotion/vim-easymotion

For switching: I suggest you try easymotion. Basically it lets you jump (or I'd like to call it teleport) to anywhere on screen even across visible windows. I cannot imagine my workflow without it.