git-conflicts
Here are 11 public repositories matching this topic...
Sort:Most stars
A little plugin to help you resolving this nasty conflicts.
- Updated
Nov 18, 2016 - Python
Bunch of useful git hooks
- Updated
Jul 31, 2021 - Shell
Utility to automatically resolve composer.lock git conflicts
- Updated
Mar 3, 2023 - JavaScript
Web app build on an external API called as MealDB, and an Involvement API which is used to record the user interactions including likes, and comments.
- Updated
Dec 1, 2022 - JavaScript
A GUI tool to fix git conflicts in a B4X project file.
- Updated
Aug 12, 2022 - C#
the never ending headache of git merge conflicts, so here we are to solve it !
- Updated
Apr 11, 2024
This repository is part of my Web Development Bootcamp @ Neue Fische 🐡 – it focuses on practicing Git conflict resolution and includes multiple branches with intentional conflicts, providing an opportunity to work through resolving them using different Git techniques.
- Updated
Dec 17, 2024 - HTML
This JavaScript capstone project is about building web application based on an external API. The API provides data about TV Shows and the app has been built around it.
- Updated
Apr 13, 2023 - JavaScript
A simple web-based tool to resolve Git merge conflicts directly in your browser.
- Updated
May 17, 2025 - JavaScript
Notify a Slack channel about git conflicts.
- Updated
Jun 8, 2021 - Shell
Improve this page
Add a description, image, and links to thegit-conflicts topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with thegit-conflicts topic, visit your repo's landing page and select "manage topics."