A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
plugin
git
jetbrains
idea
idea-plugin
androidstudio
jetbrains-plugin
androidstudio-plugin
ide-plugin
git-conflict
-
Updated
Dec 4, 2023 - Kotlin