Commit 48c9b12
committed
feat: implement rebase_skip with external abort detection and chain validation
- Add rebase_skip(): abort git rebase, restore branch from saved OID,
mark as Skipped, resume from next pending branch
- Add external git rebase --abort detection in rebase_continue():
compare branch OID with original_ref to detect bypassed aborts
- Add chain modification validation in both --continue and --skip:
warn and skip branches that were deleted during chain rebase
- Route --skip flag in command handler
- Update conflict error messages to mention --skip option1 parent 796be39 commit 48c9b12
2 files changed
Lines changed: 344 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
260 | 260 | | |
261 | 261 | | |
262 | 262 | | |
| 263 | + | |
| 264 | + | |
263 | 265 | | |
264 | 266 | | |
265 | 267 | | |
| |||
0 commit comments