Give the IntelliJ integration a spin. It's really something else. Check out the merge conflict resolution manual for some impressions: https://www.jetbrains.co

Give the IntelliJ integration a spin. It's really something else. Check out the merge conflict resolution manual for some impressions: https://www.jetbrains.com/help/idea/resolve-conflicts.html https://www.jetbrains.com/help/idea/resolve-conflicts.html