git-merge

Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files

VS Code extension providing diff editor layouts & more for 3-way merging

Simple and efficient way to delete remote branches from git repository.

⤵️ Merge in changes from upstream. Useful for syncing upstream changes to fork.

Git tutorial with command line

git Cheat Sheet

Python script for automated, iterative git merges and publishing

Merge two files like git

Testing merging via CLI

An example of a Node.js project that utilizes the npm package Husky and git hooks for automatic execution of npm install (or yarn) after git merge, git checkout or git rebase, if needed ⛑️🛠️

This repo is create to learn git features like:- branching , PR, MergePR and many more.

🔧 An extension for Git that combines multiple repositories into a single repository.

A test repository to demonstrate git merging and rebasing

🌳 Branches aren't just for trees! Learn how to create and manage branches effectively with this handy, step by step tutorial!

Example of a git workflow using rebasing

CodeClan Project 2. Week-long JavaScript Group Project - It is a single-page educational app which uses MongoDB, API with keys, webpack, CSS, and HTML. Aims: To gain experience working in a team with other developers - to understand some of the challenges this creates and ways to overcome them. To have the opportunity to use Agile working methods. To become more confident using Git/GitHub for a multi person project. To consolidate learning from the JavaScript module. To investigate some JavaScript libraries you haven't used before (learning how to read docs is an invaluable skill). To create a project using core Javascript - this means NO front-end frameworks or jQuery are allowed. TDD - unit testing of models where appropriate. Some application of Agile concepts e.g. a morning standup, sprints, a kanban board (Trello). Regular Git commits and use of branches with frequent merges.

Hiring Coders 3-Introduction Git/GitHub

Course offered by Atlassian and Coursera. Taught by Steve Byrnes.

Git and GitHub Essentials

This repo demonstrates the playing journey with Git 🚀

Implementation of beginner to advanced concepts of git and GitHub.

Git Merge 2017 Recap by @webknjaz and @anxolerd (never finished)