A little plugin to help you resolving this nasty conflicts.
Bunch of useful git hooks
Utility to automatically resolve composer.lock git conflicts
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.
A GUI tool to fix git conflicts in a B4X project file.
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.
the never ending headache of git merge conflicts, so here we are to solve it !
Notify a Slack channel about git conflicts.
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.
Add a description, image, and links to the git-conflicts topic page so that developers can more easily learn about it.
To associate your repository with the git-conflicts topic, visit your repo's landing page and select "manage topics."