Sync a feature branch onto the latest origin base branch via git rebase, with safety rails, deliberate conflict resolution, and safe force-with-lease pushing.
91
87%
Does it follow best practices?
Impact
99%
1.67xAverage score across 3 eval scenarios
Passed
No known issues
Pre-rebase safety and backup workflow
Annotated tag creation
0%
100%
Timestamp in tag name
100%
100%
Force-with-lease push
100%
100%
No plain --force
100%
100%
Fetch before rebase
100%
100%
Status preflight check
50%
100%
Merge commit detection
0%
100%
Default branch lookup
40%
100%
Confirmation before rebase
0%
100%
Confirmation before push
0%
100%
Conflict resolution approach during rebase
Prefer upstream changes
0%
100%
Regenerate generated files
0%
100%
Ask targeted question when ambiguous
33%
100%
No guessing resolution
90%
100%
Use git diff to inspect
100%
100%
Use git show to inspect commit
100%
100%
Stage only resolved files
90%
100%
git rebase --abort as safe exit
100%
100%
Avoid git reset --hard as abort
100%
100%
Post-rebase verification and recovery
git log with --oneline --decorate
0%
100%
Run tests/lint/typecheck
100%
100%
Force-with-lease push
100%
100%
Push syntax HEAD:{branch_name}
0%
100%
Confirm before push
40%
70%
Use backup ref for recovery
100%
100%
No reset --hard as default recovery
83%
100%
git rebase --abort mentioned
100%
100%
f772de4
Table of Contents
If you maintain this skill, you can claim it as your own. Once claimed, you can manage eval scenarios, bundle related skills, attach documentation or rules, and ensure cross-agent compatibility.