There are 0 repository under git-conflict topic.
A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
A GUI tool to fix git conflicts in a B4X project file.
just wanna demo how to handle git conflict when merge.