switch.vim
diffconflicts
switch.vim | diffconflicts | |
---|---|---|
6 | 16 | |
641 | 380 | |
- | - | |
3.6 | 2.4 | |
9 months ago | 3 months ago | |
Ruby | Vim Script | |
MIT License | 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.
switch.vim
-
Toggle markdown checkbox
There is also a more general plugin for swtching any statement in any filetype https://github.com/AndrewRadev/switch.vim.
-
New Plugin: boole.nvim — Toggle booleans, cycle days of the week, etc. with <C-a> and <C-x>
Cool! Seems to fill a similar space as https://github.com/AndrewRadev/switch.vim .
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
Switch.vim makes pretty easy to quick switch between definitions of something. I use it a lot to manage a list of to-dos while I'm working and quick switch between "TODO", "DOING" and "DONE"
-
nvim-toggler: invert words with two keystrokes
There is also switch.vim which has been around for a decade and a few other alternatives mentioned in the readme which are even older.
-
FAVOURITE PLUGINS
- https://github.com/andrewradev/switch.vim
-
Alternate Toggler - A very small plugin for toggling "boolean" values.
Works well for the simple usecase it tries to solve. If somebody wants even more customisability with the ability to define much more complex patterns then https://github.com/AndrewRadev/switch.vim is an alternative. It can also cycle through a list instead of just toggling between two values.
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.
What are some alternatives?
focus.nvim - Auto-Focusing and Auto-Resizing Splits/Windows for Neovim written in Lua. A full suite of window management enhancements. Vim splits on steroids!
lazygit.nvim - Plugin for calling lazygit from within neovim.
eyeliner.nvim - 👀 Move faster with unique f/F indicators.
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
sideways.vim - A Vim plugin to move function arguments (and other delimited-by-something items) left and right.
conflict-marker.vim - Weapon to fight against conflicts in Vim.
splitjoin.vim - Switch between single-line and multiline forms of code
vim-diff-enhanced - Better Diff options for Vim
no-clown-fiesta.nvim - A dark gray colorscheme
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
toggle-bool - vim plugin to toggle the boolean values
neovim - Vim-fork focused on extensibility and usability