git-conflict

There are 0 repository 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.
git git-conflict idea plugin androidstudio jetbrains jetbrains-plugin idea-plugin androidstudio-plugin ide-plugin
Language:Kotlin 12
1-max-1 / B4X_conflict_fixer
A GUI tool to fix git conflicts in a B4X project file.
b4a b4j b4x git-conflict git-conflicts gui-tool
Language:C# 1
cstnaya / test-git-conflict
just wanna demo how to handle git conflict when merge.
git git-conflict rebase
Language:HTML

liying2008 / git-conflict