> For example, I found myself preferring the JetBrains method with how merge conflicts are resolved as the interfaces laid side to side instead of stacked on to

> For example, I found myself preferring the JetBrains method with how merge conflicts are resolved as the interfaces laid side to side instead of stacked on top of each other. Not really a determining factor in the end. The side by side by side merge conflict resolution is so good that even if JetBrains had a product that did only that, I would use it instead of any other for any conflict of significance. One feature I wish both had is the ability to edit files locally and immediately sync changes remotely in a one way sync. We can do this with various sync utilities but it would be great if the IDE had the option to merely specify an ssh target machine/directory.