git-merge topic

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

balbuf

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

hyperia-sk

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

zawys

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

exions

Github 1️⃣0️⃣1️⃣

joechea-aupp

yanamura