Menu
Abort failed merge, rebase, or cherry-pick operations
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Local git operations for syncing, branching, merging, and conflict resolution
GitHub interactions for issues, PRs, releases, and repository management
Use this skill when performing hardware security analysis for System-on-Chip components — threat modeling, verification scaffolding, compliance mapping, executive briefing, microarchitectural attack analysis, physical side-channel assessment, kernel security analysis, emerging hardware security, or TLA+ formal specification. Routes to the appropriate specialist. Trigger phrases include "threat model my SoC", "run STRIDE analysis", "generate SVA assertions", "compliance check against FIPS", "executive summary of findings", "Spectre analysis for cache", "DPA attack assessment", "kernel hardening review", "PQC hardware review", "TLA+ spec for access control". Do NOT use for software-only security, network security, or web application security.
Use when working with Terraform or OpenTofu - creating modules, writing tests (native test framework, Terratest), setting up CI/CD pipelines, reviewing configurations, choosing between testing approaches, debugging state issues, implementing security scanning (trivy, checkov), or making infrastructure-as-code architecture decisions
Security audit checklist for web applications. Use when reviewing, auditing, or hardening a web app's security posture. Covers rate limiting, auth headers, IP blocking, CORS, security middleware, input validation, file upload limits, ORM usage, and password hashing. Triggers on requests like "review security", "harden this app", "security audit", "check for vulnerabilities", or when building/reviewing API endpoints.
Use this skill when connecting AI or LLMs to data platforms. Covers MCP servers for warehouses, natural-language-to-SQL, embeddings for data discovery, LLM-powered enrichment, and AI agent data access patterns. Common phrases: "text-to-SQL", "MCP server for Snowflake", "LLM data enrichment", "AI agent access". Do NOT use for general data integration (use data-integration) or dbt modeling (use dbt-transforms).
| name | Git Abort |
| description | Abort failed merge, rebase, or cherry-pick operations |
| triggers | ["git abort","abort merge","abort rebase","cancel merge","cancel rebase","undo merge"] |
| version | 1.0.0 |
| user_invocable | true |
Safely abort a failed or unwanted merge, rebase, cherry-pick, or revert operation.
/git-abort # Auto-detect and abort current operation
/git-abort merge # Explicitly abort merge
/git-abort rebase # Explicitly abort rebase
/git-abort cherry-pick # Abort cherry-pick
/git-abort revert # Abort revert
# Check for various in-progress states
if [ -d .git/rebase-merge ] || [ -d .git/rebase-apply ]; then
OPERATION="rebase"
elif [ -f .git/MERGE_HEAD ]; then
OPERATION="merge"
elif [ -f .git/CHERRY_PICK_HEAD ]; then
OPERATION="cherry-pick"
elif [ -f .git/REVERT_HEAD ]; then
OPERATION="revert"
else
echo "No operation in progress to abort."
exit 0
fi
echo "Detected in-progress: $OPERATION"
# Show what files are in conflict
echo "Current status:"
git status --short
# Show conflicting files
echo "Conflicting files:"
git diff --name-only --diff-filter=U
case "$OPERATION" in
"merge")
git merge --abort
;;
"rebase")
git rebase --abort
;;
"cherry-pick")
git cherry-pick --abort
;;
"revert")
git revert --abort
;;
esac
# Confirm we're back to clean state
echo "Restored to previous state."
git status --short
git log --oneline -1
Aborting merge...
Previous state:
Merging main into feat/dark-mode
Conflicts in 2 files
Merge aborted successfully!
Current state:
Branch: feat/dark-mode
Status: Clean working directory
HEAD: abc1234 Your last commit before merge
What to do next:
/git-merge-main # Try merge again after preparation
/git-rebase # Try rebase instead (cleaner history)
/git-stash # Stash any partial work
Aborting rebase...
Rebase was in progress:
Rebasing feat/dark-mode onto main
Stopped at commit def5678
Rebase aborted successfully!
Current state:
Branch: feat/dark-mode
Status: Clean working directory
HEAD: ghi9012 (back to before rebase)
Your commits are restored to their original state.
Alternative approaches:
/git-merge-main # Merge instead of rebase
/git-conflicts # Get help resolving conflicts next time
Aborting cherry-pick...
Was cherry-picking:
Commit abc1234 from main
Cherry-pick aborted!
Current state:
Branch: feat/dark-mode
Status: Clean
The cherry-picked commit was not applied.
No operation in progress.
Current state:
Branch: feat/dark-mode
Status: Clean working directory
Nothing to abort.
| Operation | What Abort Does |
|---|---|
merge --abort | Removes merge state, restores HEAD |
rebase --abort | Stops rebase, restores original branch state |
cherry-pick --abort | Cancels cherry-pick, cleans up |
revert --abort | Cancels revert, cleans up |
After aborting, you can:
Try again with preparation:
/git-stash # Save any work
/git-sync # Make sure you're up to date
/git-merge-main # Try again
Use a different strategy:
# If merge had too many conflicts, try rebase
/git-rebase
# Or vice versa
/git-merge-main
Get help with conflicts:
/git-conflicts # Guided conflict resolution
/git-merge-main or /git-rebase results in conflicts/git-conflicts to get help before aborting/git-stash to save any partial work