resolve those conflicts and have a happy relationship with git
Here you can share your experience with the project you are suggesting or its comparison with diff-therapy.nvim. Optional.
A valid email to send you a verification link when necessary or log in.