Hello HN!<p>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 <a href="https://neil.fraser.name/writing/patch/" rel="nofollow">https://neil.fraser.name/writing/patch/</a> and its corresponding library <a href="https://github.com/google/diff-match-patch" rel="nofollow">https://github.com/google/diff-match-patch</a>.<p>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.<p>Happy Hacking!