Topic: "git-conflicts"
sascha-wolf/sublime-GitConflictResolver
A little plugin to help you resolving this nasty conflicts.
Language: Python - Size: 432 KB - Last synced at: 3 days ago - Pushed at: over 8 years ago - Stars: 44 - Forks: 6
nafigator/php-qa-hooks
Bunch of useful git hooks
Language: Shell - Size: 349 KB - Last synced at: 7 days ago - Pushed at: over 3 years ago - Stars: 5 - Forks: 1
namoscato/resolve-composer-conflict
Utility to automatically resolve composer.lock git conflicts
Language: JavaScript - Size: 420 KB - Last synced at: 14 days ago - Pushed at: about 2 years ago - Stars: 4 - Forks: 1
KanzaTahreem/The-MealDB
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.
Language: JavaScript - Size: 4.22 MB - Last synced at: 14 days ago - Pushed at: over 2 years ago - Stars: 4 - Forks: 1
denoerss/git-conflicts
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.
Language: HTML - Size: 219 KB - Last synced at: 8 days ago - Pushed at: 4 months ago - Stars: 1 - Forks: 0
jdevfullstack-tutorials/git-merge-resolve
the never ending headache of git merge conflicts, so here we are to solve it !
Size: 3.91 KB - Last synced at: about 1 year ago - Pushed at: about 1 year ago - Stars: 1 - Forks: 0
ashmalzahra/JavaScript-group-capstone-project
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.
Language: JavaScript - Size: 451 KB - Last synced at: 16 days ago - Pushed at: about 2 years ago - Stars: 0 - Forks: 1
KanzaTahreem/Gitflow
Practiced Gitflow with dummy text files.
Size: 9.77 KB - Last synced at: about 2 months ago - Pushed at: over 2 years ago - Stars: 0 - Forks: 0
nickFalcone/git-conflict-bot
Notify a Slack channel about git conflicts.
Language: Shell - Size: 89.8 KB - Last synced at: about 2 years ago - Pushed at: almost 4 years ago - Stars: 0 - Forks: 0
