Git Conflict

Compatible with: IntelliJ IDEA PhpStorm WebStorm PyCharm RubyMine AppCode CLion GoLand DataGrip Rider MPS Android Studio
Apr 29, 2018
3 952
Introduce
Highlight git conflict content and fix conflicts more conveniently.



Screenshot

Recent change notes

v1.0.0
  • Supports custom color schemes.
  • Fix one bug.

  • v0.0.1
  • Add the "Auto" option to the Settings panel.(Please uninstall the previous version.)
  • Fix one bug.

  • v0.0.1-rc
    A plugin for Jetbrains IDE aim to highlight git conflict content.
    please see liying2008/git-conflict for more information.
  • The first release.