IntelliJ 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. They can even update in real-time as you and your teammates are editing.
1 Comment
Sort: