A little plugin to help you resolving this nasty conflicts.

git conflict-resolution sublime-text sublime-text-3 hacktoberfest sublime-text-package git-conflicts sublime-text-3-package git-conflict-resolver

• Updated Nov 18, 2016
• Python

Utility to automatically resolve composer.lock git conflicts

git resolver conflict-resolution composer conflict git-conflicts

• Updated Apr 2, 2026
• 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.

css html api promises json api-documentation callback unittest asynchronous-programming es6-modules gitflow jest-tests group-project javascript-es6 kanban-board seafood github-projects git-conflicts mealdb-api meals-recipes

• Updated Dec 1, 2022
• JavaScript

Bunch of useful git hooks

git php code-style git-hooks bash-script code-standard git-conflicts php-syntax

• Updated Jul 31, 2021
• Shell

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#

the never ending headache of git merge conflicts, so here we are to solve it !

git git-workflow git-merge git-tools git-conflicts git-mastery

• 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.

git git-conflicts

• Updated Dec 17, 2024
• HTML

learning git-conflicts

• Updated Jan 11, 2026

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.

unit-testing json webpack jest single-page-app best-practices promise callback code-review es6-modules api-rest gitflow html-css-javascript git-conflicts asyncronous

• Updated Apr 13, 2023
• JavaScript

Practiced Gitflow with dummy text files.

gitflow git-conflicts dummy-text

• Updated Dec 1, 2022

A simple web-based tool to resolve Git merge conflicts directly in your browser.

github javascript css git html js git-conflicts git-conflict git-conflict-resolver conflict-resolver conflict-git conflict-solver

• Updated May 17, 2025
• JavaScript

Notify a Slack channel about git conflicts.

git shell-script slack-bot git-conflicts

• Updated Jun 8, 2021
• Shell