GitHunt
VO

vovak/ExplainMergeConflict

An IntelliJ IDEA plugin that discovers performed refactorings in the commit history of the project and visualizes them

ExplainMergeConflict

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 2020 JetBrains N.V, as stated in the MIT License

Languages

Java89.3%Shell8.9%Perl1.9%

Contributors

BBIOMAAIKPVOONJUCE
MIT License
Created July 31, 2020
Updated February 15, 2022
vovak/ExplainMergeConflict | GitHunt