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

Github 1️⃣0️⃣1️⃣

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

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

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

List of great merge drivers for git and other version control tools

Git tutorial with command line

Practical Git Cheat Sheet, Encompassing Key Use Cases and Command Structures

Merge two files like git

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 ⛑️🛠️

Hiring Coders 3-Introduction Git/GitHub

Here is some usefull Git branching And merging command that you need to know for working in a team project.

git squash vs git merge vs git rebase

Python script for automated, iterative git merges and publishing

Project #60 of Codecademy's Full Stack Engineer Career Path

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

Project #59 of Codecademy's Full Stack Engineer Career Path

Basic Git Commands and Workflow

A repository created as part of a school assignment on Git & Github that contains ~4 jobs.