rebase_skip
Skip a commit during rebase when its change is already in the base or the conflict resolves to no change, allowing the rebase to continue.
Instructions
Drop the commit being replayed and carry on.
For a commit whose change is already in the base under a different sha, or one whose conflict resolves to "the branch already says this". Git offers it at every conflict; without it here the only way to take that offer is to reach past these tools and run git by hand, which is how a rebase ends up half driven from each side.
Refused when nothing is being replayed: skipping is a decision about a
commit, and at a break or a failing exec there is no commit in question.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| repo | No | . | |
| auto_resolve | No |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| head | Yes | ||
| step | No | ||
| state | Yes | ||
| action | No | ||
| git_said | No | ||
| guidance | Yes | ||
| can_amend | Yes | ||
| replaying | No | ||
| auto_resolved | No | ||
| conflicted_files | No | ||
| head_is_replaying_commit | Yes |