Skip to content

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

License

Notifications You must be signed in to change notification settings

vovak/ExplainMergeConflict

This branch is 39 commits behind ualberta-smr/ExplainMergeConflict:dev.

Folders and files

NameName
Last commit message
Last commit date
Jul 7, 2020
Jul 16, 2020
May 26, 2020
Apr 29, 2020
Jul 13, 2020
Jul 25, 2020
Jul 30, 2020
Jun 30, 2020
Apr 26, 2020
Jun 21, 2020
Jul 23, 2020
Jul 23, 2020
Jul 13, 2020
Apr 26, 2020
Apr 26, 2020
Apr 26, 2020

Repository files navigation

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

About

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

Resources

License

Stars

Watchers

Forks

Packages

No packages published

Languages

  • Java 89.2%
  • Shell 8.9%
  • Perl 1.9%