Git Squash

Pre-flight Checks

Before merging, validate the environment:

1. Determine source branch — use the argument if provided (/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

If remote origin exists, pull latest with git pull --ff-only. If ff-only fails, abort — main has diverged and needs manual resolution.