ExplainMergeConflict is a work-in-progress IntelliJ plugin that expands the functionality of RefactorInsight and IntelliJ's built-in git plugin in order to improve the merge conflict resolution experience.
This research is currently ongoing at UAlberta SMR research group at the University of Alberta.
ExplainMergeConflict is a fork of RefactorInsight, and copyright for the source code of RefactorInsight present in this project are held by their copyright owners, as stated in the MIT License.