cheatsheet
diffconflicts
| cheatsheet | diffconflicts | |
|---|---|---|
| 4 | 16 | |
| 205 | 380 | |
| - | - | |
| 5.6 | 2.4 | |
| 14 days ago | 3 months ago | |
| Vim Script | ||
| The Unlicense | 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.
cheatsheet
-
Ask HN: Share a shell script you like
I have quite a few, my personal collection of shell scripts: https://github.com/fastily/autobots
I also curate a shell command cheatsheet: https://github.com/fastily/cheatsheet
- Can I see your cheatsheet?
- Ask HN: Can I see your cheatsheet?
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?
cheat - cheat allows you to create and view interactive cheatsheets on the command-line. It was designed to help remind *nix system administrators of options for commands that they use frequently, but not frequently enough to remember.
lazygit.nvim - Plugin for calling lazygit from within neovim.
dotfiles
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
zsh-histdb - A slightly better history for zsh
conflict-marker.vim - Weapon to fight against conflicts in Vim.
learn_gnuawk - Example based guide to mastering GNU awk
vim-diff-enhanced - Better Diff options for Vim
tldr - 📚 Collaborative cheatsheets for console commands
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
cheatsheets - Cheatsheets for web development - devhints.io
neovim - Vim-fork focused on extensibility and usability