mergiraf.org
Mergiraf can solve a wide range of Git merge conflicts. That's because it's aware of the trees in your files! Thanks to its understanding of your language, it can often reconcile the needs of both sides.
Tag: git
3 resources tagged with "git"
I wish you nothing but merge conflicts.
Preventing git commit --amend with Claude Code Hooks
How to use Claude Code's pre-command hooks to block git commit --amend in your repository