Git Squash

Pre-flight Checks

1. Determine source branch — use the argument if provided (

   /git-squash feature/my-branch

   ), otherwise use the current branch.
2. Verify not on main — abort if source branch is

   main

   .
3. Check for uncommitted changes —

   git status --porcelain

   . If dirty, abort and suggest committing or stashing.
4. Verify branch exists —

   git rev-parse --verify <branch>

   .
5. Verify divergence —

   git log main..<branch> --oneline

   . If empty, abort — nothing to merge.

Switch to Main

git checkout main

origin

git pull --ff-only

Squash Merge

git merge --squash <branch>

git merge --abort

git rebase main

Delegate to git-commit

/git-commit

Post-merge Verification

git log --oneline -5
git status
git diff

Cleanup

git branch -d <branch>

-d

git diff main <branch>

git branch -D <branch>

git ls-remote --heads origin <branch>

git push origin --delete <branch>

Rules

• Proceed without confirmation — pre-flight checks are the safety gate.
• Only merge into

  main

  .
• Always use

  --squash

  — never fast-forward or regular merge.
• Always delegate the commit to

  /git-commit

  .
• Abort on merge conflicts — never auto-resolve.
• Never force-push.
• Prefer

  git branch -d

  — use

  -D

  only after verifying zero diff.
• If any step fails, stop and report the error.

Quick Reference

git merge --squash

/git-commit

-d

-D