autobots
diffconflicts
autobots | diffconflicts | |
---|---|---|
5 | 16 | |
70 | 380 | |
- | - | |
7.5 | 2.4 | |
5 days ago | 3 months ago | |
Shell | Vim Script | |
GNU General Public License v3.0 only | 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.
autobots
-
Ask HN: What are your favorite iOS/macOS automations?
sort of an automation, but I install all my favorite apps with brew and then use brew again (brew upgrade && brew upgrade --cask -g) to update everything
Bonus: I went the extra mile and wrote a script that bootstraps my entire setup: https://github.com/fastily/autobots/blob/master/macOS/setup/...
-
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
-
Ask HN: 我可以看看你的剧本吗? (Ask HN: Can I see your scripts?)
I'll go first: https://github.com/fastily/autobots
- Ask HN: Can I see your scripts?
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?
ack3 - ack is a grep-like search tool optimized for source code.
lazygit.nvim - Plugin for calling lazygit from within neovim.
IKEv2-setup - Set up Ubuntu Server 20.04 (or 18.04) as an IKEv2 VPN server
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
hacker-scripts - Based on a true story
conflict-marker.vim - Weapon to fight against conflicts in Vim.
spellbook - 🪄 Shell and Powershell scripts registry
vim-diff-enhanced - Better Diff options for Vim
bitbar - Put the output from any script or program into your macOS Menu Bar (the BitBar reboot)
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
argos - Create GNOME Shell extensions in seconds
neovim - Vim-fork focused on extensibility and usability