Squash Pr
- 1 installs
- Updated April 13, 2026
- cookeyholder/django-devcontainer-template
Squash and clean up commits in Django dev container PRs before merging.
About
Git workflow for squashing commits in Django projects using dev container templates. Keeps PR history clean and maintainable before merge.
- Interactive git commit squashing in containerized environment
- Clean PR history management
Squash Pr by the numbers
- 1 all-time installs (skills.sh)
- Ranked #524 of 733 Git & Pull Requests skills by installs in the Skillselion catalog
- Data as of Jul 8, 2026 (Skillselion catalog sync)
npx skills add https://github.com/cookeyholder/django-devcontainer-template --skill squash-prAdd your badge
Show developers this skill is listed on Skillselion. Paste this into your README.
| Installs | 1 |
|---|---|
| Last updated | April 13, 2026 |
| Repository | cookeyholder/django-devcontainer-template ↗ |
What it does
Squash and clean up commits in Django dev container PRs before merging.
Files
Use this skill when the user wants to finalize a PR by squashing into main after confirming there are no new review comments, then sync local main.
Input
- Optional PR number/URL (e.g.,
17or full PR URL) - If omitted, infer from current branch with
gh pr view
Workflow
1. Resolve target PR
gh pr view <pr> --json number,url,state,isDraft,headRefName,baseRefName,mergeStateStatus,reviews,comments,latestReviewsRules:
- PR must be
OPEN - PR must not be draft
- base branch must be
main
2. Check for new review feedback
- Inspect newest reviews/comments and identify whether there are actionable items not yet addressed.
- If any new actionable feedback exists, stop and report them.
- If there is no new actionable feedback, continue.
3. Check merge readiness / CI
gh pr checks <pr>
gh pr view <pr> --json mergeStateStatus,reviewDecisionRules:
- Required checks should be passing.
mergeStateStatusshould allow merge (CLEAN/mergeable equivalent).- If checks are pending/failing, stop and report.
4. Squash merge to main
gh pr merge <pr> --squash --delete-branch- If merge fails, report the exact blocker.
5. Update local main
git fetch origin --prune
git checkout main
git pull --ff-only origin main6. Report completion
Return:
- PR number and URL
- merge commit SHA
- local
mainhead commit - whether branch deletion succeeded
Guardrails
- Never merge if new actionable review feedback exists.
- Never merge if required checks are failing/pending.
- Do not use force push or destructive git commands.
- If local workspace has conflicting uncommitted changes preventing checkout to
main, stop and report.
Related skills
Caveman CommitGenerate terse, Conventional Commits messages that preserve intent without fluff or AI attribution.272k94k
Resolving Merge ConflictsQuickly understand, resolve, and commit merge conflicts without losing work or breaking their flow.183k193kGit Guardrails Claude CodePrevent Claude Code from accidentally running destructive git commands like force push, hard reset, or clean.175k193k
Using Git WorktreesGuarantee every new feature or implementation task runs inside a clean, isolated workspace without polluting the main branch or current working directory.149k263k
Git CommitGenerate accurate conventional commit messages and intelligently stage files directly from natural language requests.40.6k37.2k
Resolve Merge ConflictsQuickly understand and resolve Git merge conflicts without losing context or breaking changes.16.5k148