git-conflict

Star

Here are 4 public repositories matching this topic...

liying2008 / git-conflict

Star

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 Jan 22, 2025
Kotlin

1-max-1 / B4X_conflict_fixer

Star

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

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

Updated Aug 12, 2022
C#

This repository is part of my Web Development Bootcamp @ Neue Fische 🐡 – it is focused on advanced Git concepts and includes a session where merge conflicts are intentionally triggered, giving the opportunity to practice resolving complex conflicts and deepen the understanding of Git workflows.

git merge-conflicts git-conflict

Updated Dec 17, 2024
JavaScript

cstnaya / test-git-conflict

Star

just wanna demo how to handle git conflict when merge.

git rebase git-conflict

Updated Mar 24, 2023
HTML

Improve this page

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

Curate this topic

Add this topic to your repo

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

Learn more

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

git-conflict

Here are 4 public repositories matching this topic...

liying2008 / git-conflict

1-max-1 / B4X_conflict_fixer

denoerss / git-advanced

cstnaya / test-git-conflict

Improve this page

Add this topic to your repo