winresizer
diffconflicts
winresizer | diffconflicts | |
---|---|---|
5 | 16 | |
573 | 380 | |
- | - | |
0.0 | 2.4 | |
about 1 year ago | 4 months ago | |
Vim Script | 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.
winresizer
-
What's the alternative to simeji/winresizer?
It seems that simeji/winresizer: very simple vim plugin for easy resizing of your vim windows (github.com) breaks on recent neovim nightly updates. Does anyone know some alternatives to this? Want I mainly want to achieve is swapping buffers of adjacent windows.
- What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
-
How to quickly resize viewports and move between them?
Try https://github.com/simeji/winresizer Makes me feel like i3.
-
I am so glad and excited when I learn about multiple windows on vim, guess I'll use it more often.
Have you seen winresizer? https://github.com/simeji/winresizer
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?
blamer.nvim - A git blame plugin for neovim inspired by VS Code's GitLens plugin
lazygit.nvim - Plugin for calling lazygit from within neovim.
dial.nvim - enhanced increment/decrement plugin for Neovim.
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
vim-macrobatics - Plugin for Vim that makes it easier to record / play / edit macros
conflict-marker.vim - Weapon to fight against conflicts in Vim.
Mosh - Mobile Shell
vim-diff-enhanced - Better Diff options for Vim
vim-venter - Vim plugin that horizontally centers the current window(s)
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
nvim-scrollbar - Extensible Neovim Scrollbar
neovim - Vim-fork focused on extensibility and usability