git-conflict

Here are 3 public repositories matching this topic...

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

A GUI tool to fix git conflicts in a B4X project file.

b4x b4j git-conflicts b4a git-conflict gui-tool

just wanna demo how to handle git conflict when merge.

git rebase git-conflict

Add a description, image, and links to the git-conflict topic page so that developers can more easily learn about it.

To associate your repository with the git-conflict topic, visit your repo's landing page and select "manage topics."