rebase

You can rebase a feature branch onto main by running the Skill with a specified target branch, which triggers pre-flight checks, executes deterministic rebase commands against origin/main, and resolves per-file conflicts while recording a final summary report.

Rebasing your feature branch onto a target branch maintains a linear git history by replaying commits on top of the latest origin/main, automatically resolving any per-file conflicts and generating an audit summary of the changes.

Yes, you need a clean working tree before starting a git rebase. The Skill performs pre-flight checks to ensure your working directory is clean and that your target remote-tracking branch is up-to-date before initiating the rebase process.

Yes, you can specify a custom target branch to rebase your current branch onto. If no target branch is provided, the Skill defaults to using master or main, preferring remote-tracking branches when available to ensure accurate integration.

Automatic conflict resolution during a branch rebase works by reading conflicting files, merging changes while preserving intent, and entering a resolution loop that handles per-file conflicts. Each resolution is recorded to produce a concise final summary report.

Automated rebase provides deterministic conflict resolution and detailed audit logs, capturing each change in a summary report, whereas manual resolution lacks systematic tracking and can lead to inconsistent history when integrating feature branches with origin/main.