https://github.com/balbuf/composer-git-merge-driver

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

composer composer-json composer-lock git git-merge git-merger merge merge-conflict merge-conflicts

Last synced: 05 Apr 2025

https://github.com/joechea-aupp/github_tut

Github 1️⃣0️⃣1️⃣

git-branching git-clone git-fork git-merge

Last synced: 10 Apr 2025

https://github.com/hyperia-sk/remote-branch-housekeeping

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

branch cleaner git git-branch git-branching git-merge git-mergetools housekeeping remote

Last synced: 09 Jul 2025

https://github.com/yanamura/git-flow-merge-action

git-flow git-merge gitflow github-actions

Last synced: 16 Mar 2025

https://github.com/bzdgn/git-tutorial

Git tutorial with command line

git git-merge git-rebase git-revert git-squash git-tutorial github merge merge-conflict rebase revert squash

Last synced: 11 Apr 2025

https://github.com/jamescherti/batchfetch

Batchfetch: Efficiently clone or pull multiple Git repositories in parallel

git git-clone git-fetch git-merge git-pull

Last synced: 10 Mar 2026

https://github.com/thekoushik/safe-merge-files

Merge two files like git

git-merge javascript merge-files nodejs

Last synced: 20 Apr 2026

https://github.com/siphalor/giup

Python script for automated, iterative git merges and publishing

git git-merge pypi workflow

Last synced: 07 Mar 2026

https://github.com/Siphalor/giup

Python script for automated, iterative git merges and publishing

git git-merge pypi workflow

Last synced: 01 Apr 2025

https://github.com/mrflynn/git-absorb

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

git git-merge github shell-script

Last synced: 16 Apr 2026

https://github.com/developer-shourav/git-branching-marging

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

git git-branching git-merge project-management team-work

Last synced: 10 Apr 2025

https://github.com/thinkverse/merge-via-cli

Testing merging via CLI

git-merge github-cli how-to

Last synced: 30 Jan 2026

https://github.com/wavim/vscode-git-branch

Level up Inspector for Git Branches

git-branches git-merge vscode-extension

Last synced: 19 Jun 2026

https://github.com/mistweaverco/diffconflicts.nvim

Make resolving merge conflicts in Neovim a breeze.

git git-merge git-mergetool git-mergetools neovim neovim-plugin

Last synced: 02 Feb 2026

https://github.com/vi/for_merge

A test repository to demonstrate git merging and rebasing

git-merge git-rebase plaintext sample

Last synced: 16 Mar 2026

https://github.com/anshul-sonpure/basic-git-commands

Basic Git Commands and Workflow

git git-cheatsheet git-cheatsheets git-commands git-diff git-merge github version-control

Last synced: 15 May 2026

https://github.com/carbonicsoda/vscode-git-branch-master

VSCode Extension - Level up Inspector for Git Branches

git-branches git-merge vscode-extension

Last synced: 15 Mar 2025

https://github.com/myst729/git-diff-merge-loss

Code loss in resolving git merge conflict

conflict git git-merge

Last synced: 14 Jul 2025

https://github.com/aishwaryasubash/learn-git

Git: Exploring Version Control Basics

git git-branch git-commands git-commit git-merge git-pull git-push

Last synced: 06 Nov 2025

https://github.com/renswickd/merge-conflict-explore

One-stop repo to understand git conflict with hands-on tutorials

git git-commands git-merge git-merge-conflicts

Last synced: 05 May 2026

https://github.com/ronald-kimeli/challenge-git-task

Node js task based on challenge kit

git-contribute git-merge git-push github-config node-js

Last synced: 18 May 2026