Suggest an alternative to

diff-therapy.nvim

resolve those conflicts and have a happy relationship with git

Why do you think that https://github.com/tpope/vim-unimpaired is a good alternative to diff-therapy.nvim

A URL to the alternative repo (e.g. GitHub, GitLab)

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.