git-conflict
Here are 5 public repositories matching this topic...
Language:All
A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
- Updated
Aug 14, 2025 - Kotlin
A GUI tool to fix git conflicts in a B4X project file.
- 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.
- Updated
Dec 17, 2024 - JavaScript
A simple web-based tool to resolve Git merge conflicts directly in your browser.
- Updated
May 17, 2025 - JavaScript
Improve this page
Add a description, image, and links to thegit-conflict topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with thegit-conflict topic, visit your repo's landing page and select "manage topics."