WebStorm has an early warning system for merge conflicts. If enabled there will be change indicators in the gutter of the editor. These will show you where your teammates have made changes compared to your version of the file and even update in real-time. For simple conflicts this can be a quick way to resolve them.
1 Comment
Sort: