spellbook
diffconflicts
spellbook | diffconflicts | |
---|---|---|
3 | 16 | |
3 | 380 | |
- | - | |
7.1 | 2.4 | |
9 months ago | 3 months ago | |
TypeScript | 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.
spellbook
-
Ask HN: How do you find contributors to open source projects?
- Spellbook: Shell and Powershell scripts registry - https://github.com/jmaczan/spellbook demo https://spellbook.maczan.pl/ [Python, TypeScript]
-
Ask HN: Share a shell script you like
Hi, I'd like to ask what are the shell scripts you enjoy using or find useful?
It might be something you incorporated to your terminal-based workflow. Or maybe some specific scripts that you often reuse. Or you have used it once, but it might be useful to other people. Or maybe you just have a script that is fun to use? Please share
My (not anymore) hidden intention is to gather your recommendations to build an open-source shell script registry Spellbook https://spellbook.maczan.pl/ Source code is here for you if you want to self host or fork it https://github.com/jmaczan/spellbook
A script I sometimes use is a commands repeater https://github.com/jmaczan/spellbook/blob/main/registry/spells/repeat-sh/spell.sh You can specify an interval and a flag to reset/keep the terminal's content after a script invocation
Thanks!
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?
pyxargs - Command line Python scripting with an xargs-like interface and AWK-like capabilities for data processing and task automation
lazygit.nvim - Plugin for calling lazygit from within neovim.
fuz - Fuzzy search text / notes in the terminal, for any collection of text files
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
stderred - stderr in red
conflict-marker.vim - Weapon to fight against conflicts in Vim.
vim-mergetool - Better vim-based mergetool
vim-diff-enhanced - Better Diff options for Vim
dotfiles
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
autobots - ⚡️ Scripts & dotfiles for automation and/or bootstrapping new system setup
neovim - Vim-fork focused on extensibility and usability