0

Conflict Resolver: another view on conflicts

sergey ivasenko 5 hours ago 0

The only thing that i find often inconvenient in SmartGit - the way conflicts are displayed and handled in Conflict Resolver.

SmartGit view:

Image 956

JetBrains GitClient view:

Image 957

The later has much more clear (and less scaring :) LOL)  picture of the conflicts.

Would be perfect if we are able to switch to yet another view on the conflicts that would be similar to the one on the second screenshot!

Thank you!

Conflict Solver