From pds
Rebases current branch against target (default: main) to incorporate upstream changes. Stops on conflicts; --fix mode adds autonomous resolution and test-fix loops.
npx claudepluginhub rmzi/portable-dev-system --plugin pdsThis skill uses the workspace's default tool permissions.
Focused rebase of the current branch against a target. Lists conflicts and stops if any are found. Does NOT run tests, read code, or do anything beyond the rebase operation unless explicitly asked.
Rebases current Git branch onto target (main/origin/branch) with smart conflict resolution: analyzes target changes via git log, preserves both sides.
Automates git rebase on main/master: fetches updates, rebases current branch, intelligently resolves conflicts, and force-pushes with lease. Use before PRs or merges.
Rebases current feature branch onto latest base branch (main/master/develop). Validates preconditions, stashes uncommitted changes, fetches updates, handles conflicts, and aborts on failure.
Share bugs, ideas, or general feedback.
Focused rebase of the current branch against a target. Lists conflicts and stops if any are found. Does NOT run tests, read code, or do anything beyond the rebase operation unless explicitly asked.
/pds:finish branch completion protocolgit fetch origin
Ensure working tree is clean before rebasing:
git status
If there are uncommitted changes, commit or stash them first. Do not proceed with a dirty working tree.
git rebase origin/<target-branch>
Default target: main. Use the branch specified by the user if provided.
If conflicts occur — STOP.
List each conflict clearly:
## Rebase Conflicts
- `path/to/file.ts` — conflict between local change and upstream
- `path/to/other.ts` — both sides modified the same function
Do NOT attempt to resolve conflicts automatically. Report them and wait for instructions.
To abort if needed:
git rebase --abort
When rebase completes successfully (no conflicts):
git log --oneline origin/<target-branch>..HEAD
Show the rebased commits to confirm the result.
/pds:verify for that)./pds:verify or the reviewer agent)./rebase # rebase against main (standard mode)
/rebase develop # rebase against develop
/rebase origin/release # rebase against specific remote branch
/rebase --fix # autonomous rebase-test-fix loop (see below)
/rebase --fix develop # autonomous loop against develop
--fix)When invoked with --fix, the rebase skill enters an autonomous loop that resolves conflicts, runs tests, and fixes failures iteratively. Use when you want hands-off rebase resolution.
Cycle 1:
1. Rebase (steps 1-3 above)
2. If conflicts → attempt resolution
3. Run test suite
4. If tests pass → done
5. If tests fail → fix failures
Cycle 2-3:
Repeat steps 2-5
Cycle 4 (max):
If still failing → STOP and escalate
For each conflicted file:
git rebase --continueAfter successful rebase (or conflict resolution):
git log/pds:bugfix methodologyWhen the loop exhausts its cycles:
## Rebase-Fix Escalation
### Attempted
- Cycle 1: [what was tried, what failed]
- Cycle 2: [what was tried, what failed]
- Cycle 3: [what was tried, what failed]
### Remaining failures
- `test_name` — `path:line` — [error description]
### Recommendation
[What a human should look at to resolve this]
/pds:finish — Full branch completion protocol (includes rebase as step 2)/pds:verify — Run tests after rebase to confirm nothing broke/pds:bugfix — Test-first bug fix methodology (used in fix cycles)