Resolve Git Conflicts Automatically
Show HN: Resolve Git Conflicts Automatically
Resolve Git Conflicts Automatically is active in the show hn launch space.
Profile
Hello HN!I was always annoyed by conflicts that can be solved automatically, but still need human intervention. E.g. two people changing the same line, but at different, non-conflicting positions. So I searched for a character based patching library and found this nice article https://neil.fraser.name/writing/patch/ and its corresponding library https://github.com/google/diff-match-patch.Parsing git conflicts, applying patches and showing some useful diffs in the UI helps me to solve 80% of my conflicts automatically. I hope it can help you too.Happy Hacking!
As a business in show hn launch, Resolve Git Conflicts Automatically is listed here with the public details available about it.
Directory data places it at the Show HN launch stage.
| Sector | Show HN launch |
|---|---|
| Stage | Show HN launch |
Website: fdietze.github.io/blend
Browse related
Create a free account