3-way diff

One feature that's sorely missing is a 3-way diff in code reviews. I have a workaround of using the command line to look at the 3-way diff locally, and then adding comments or resolving the conflict in Space, but it's a pain. There should be an option to turn 3-way diff on, and it should be the default.


1 comment

Blamario , it would be worth filing a feature request ticket in https://youtrack.jetbrains.com/issues/SPACE. These forums don't seem to get much attention.


Please sign in to leave a comment.