GitHub repository: ualberta-smr/ExplainMergeConflict
Primary language: Java
Description: A still in development IntelliJ IDEA plugin that aims to simplify merge conflict resolutions