Conflict resolution techniques used in IntelliJ


I am writing a Research paper on 'Conflict resolutions techniques' and their usage in popular collaborative tools. One of these tools happen to be IntelliJ, and I would like to know internally which conflict resolution technique IntelliJ uses i.e. Operational transformation, copy-modify-merge etc. Also any additional technical information in that direction.

1 comment
Comment actions Permalink


AFAIU IntelliJ is not a collaborative tool (ie: text editor that allows simultaneous access by multiple users). There are plugins with such functionality, but this question should be addressed to the particular implementation.

If you're talking about VCS integration, IntelliJ supports typical copy-modify-merge approach with 3-way by-line merge conflict resolve. 


Please sign in to leave a comment.