diffconflicts
vim-easymotion
diffconflicts | vim-easymotion | |
---|---|---|
16 | 47 | |
380 | 7,367 | |
- | 0.5% | |
2.4 | 0.0 | |
4 months ago | 4 months ago | |
Vim Script | Vim Script | |
BSD 3-clause "New" or "Revised" License | - |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
diffconflicts
-
Ask HN: Share a shell script you like
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...
-
Integrating Git and (Neo)Vim: LazyGit + Fugitive + MergeTool for maxiumum efficiency [Showcase]
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.
-
Poll: how do you jump to Git conflict markers?
https://github.com/whiteinge/diffconflicts as a merge tool
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
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.
-
Your git setup for neovim?
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.
- Here's a question
-
Vim Regex
For resolving conflicts I recommend https://github.com/whiteinge/diffconflicts, the demo video explains it best https://www.youtube.com/watch?v=Pxgl3Wtf78Y.
-
What have you changed in your VIM workflow recently?
have you tried diffconflicts? started using it ages ago, might be worth checking out if you get tired of editing by hand.
- Which tools do you use for Git Conflicts?
-
Is there a better way to see git diff in vim?
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
-
Do you folks have any unpopular vim script customizations you are proud of?
vim-easymotion together with space as mapleader (let mapleader = "\" in your .vimrc) can open up a new world for you.
-
F/f/T/t highlight plugin?
Why not sneak or easymotion?
-
Vim user Switching to Colemak-DHm, need advice.
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.
-
How to move really efficiently in Vim?
Incredible that nobody mentioned vim-easymotion - totally necessary for me.
-
Weekly Vim tips and tricks thread! #24
But have you tried https://github.com/easymotion/vim-easymotion (I recommend let mapleader = "\").
-
Blog | My Vim Command Workflow
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.
- How to achieve vim-easymotion behaviour in hx?
-
Leap.nvim: Neovim’s Answer to the Mouse
Been around since ~2012 via vim-easymotion as well: https://github.com/easymotion/vim-easymotion
-
Line motions why is there no `[count]gm`?
I second the suggestion of using a plugin like easymotion. https://github.com/easymotion/vim-easymotion
-
window switching and splitting
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.
What are some alternatives?
lazygit.nvim - Plugin for calling lazygit from within neovim.
hop.nvim - Neovim motions on speed!
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
vim-sneak - The missing motion for Vim :athletic_shoe:
conflict-marker.vim - Weapon to fight against conflicts in Vim.
leap.nvim - Neovim's answer to the mouse 🦘
vim-diff-enhanced - Better Diff options for Vim
vimium - The hacker's browser.
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
quick-scope - Lightning fast left-right movement in Vim
neovim - Vim-fork focused on extensibility and usability
lightspeed.nvim - deprecated in favor of leap.nvim