rebase_finish
Verify a completed rebase against its starting point to ensure no commits were dropped or conflicts resolved incorrectly, and scan for conflict markers to validate the branch's intended change.
Instructions
Check the finished rebase against the tip it started from, and tidy up.
What must stay the same is the change the branch makes to its base -- not the resulting tree, which legitimately changes when the rebase also moves onto newer upstream work. A difference here is a report of damage: a commit dropped from the todo, or a conflict resolved the wrong way. Every rewritten commit is also scanned for conflict markers, since one committed part-way and tidied up later still leaves a commit nobody can build.
The backup tag is kept either way; deleting the only record of where the branch was is not this tool's decision to make.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| repo | No | . | |
| allow_change | No |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| ok | Yes | ||
| commits | Yes | ||
| guidance | Yes | ||
| restored | Yes | ||
| backup_ref | Yes | ||
| branch_change | Yes | ||
| reordered_only | No | ||
| commits_with_markers | Yes |