Utility to automatically resolve composer.lock git conflicts
-
Updated
Mar 3, 2023 - JavaScript
#
git-conflicts
Here are 4 public repositories matching this topic...
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
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
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
Improve this page
Add a description, image, and links to the git-conflicts topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the git-conflicts topic, visit your repo's landing page and select "manage topics."