git-conflict

There are 3 repositories under git-conflict topic.

liying2008/git-conflict
A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
Language:Kotlin12 4 51
1-max-1/B4X_conflict_fixer
A GUI tool to fix git conflicts in a B4X project file.
Language:C#1 1 20
cstnaya/test-git-conflict
just wanna demo how to handle git conflict when merge.
Language:HTML1 0