Comment by csomar

https://codeinput.com - Tools for PR-Git workflows

Currently experimenting with semantic diffs for the merge conflicts editor: https://codeinput.com/products/merge-conflicts/demo

You can try by installing the GitHub App which will detect PRs who have a merge conflict and create a workspace for them.