GitHub repository

magic-merge-commit

magic-merge-commit contains 1 collected skills from koppor, with repository-level occupation coverage and site-owned skill detail pages.

koppor profile View on GitHub

skills collected

Stars

updated

2026-05-18

Forks

Occupation coverage

Software Developers

1 occupation categories · 100% classified

repository explorer

Skills in this repository

creator/repo/skill

skill

occupation

description

updated

magic-merge-commit

software-developers

Fix a Git merge conflict caused by a squash-merged base branch. Use when a PR can't merge `main` cleanly because its base branch was squash-merged, and Git sees the old commits as conflicting with the squashed commit in `main`. Creates a "magic" merge commit linking the branch to the squashed history.

2026-05-18