Skip to content

Add optional rebase before commit flow#273

Merged
BunsDev merged 1 commit into
mainfrom
okcode/rebase-before-commit
Apr 5, 2026
Merged

Add optional rebase before commit flow#273
BunsDev merged 1 commit into
mainfrom
okcode/rebase-before-commit

Conversation

@BunsDev

@BunsDev BunsDev commented Apr 5, 2026

Copy link
Copy Markdown
Member

Summary

  • Add a new rebase before commit setting to let commit actions rebase the current branch onto the repository default branch before committing.
  • Thread the new rebaseBeforeCommit flag through the shared git contract, web settings, mutation wiring, progress UI, and server-side git manager.
  • Implement server-side rebase handling with remote/default-branch resolution, autostash support, and clearer conflict/error reporting.
  • Cover the new behavior with contract, settings, UI logic, and GitManager tests.

Testing

  • bun fmt
  • bun lint
  • bun typecheck
  • Added/updated targeted tests for the new setting, progress stages, contract parsing, and rebase-before-commit GitManager flow.

- Add a Git setting and stacked-action flag to rebase onto the default branch before committing
- Surface the new commit-stage progress and default the setting off
- Cover the new contract, settings, and GitManager behavior
@vercel

vercel Bot commented Apr 5, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
okcode-marketing Ready Ready Preview Apr 5, 2026 11:18am
v0-compute-the-platform-to-build Ready Ready Preview, Open in v0 Apr 5, 2026 11:18am

@github-actions github-actions Bot added size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Apr 5, 2026
@BunsDev BunsDev merged commit 773d273 into main Apr 5, 2026
10 of 11 checks passed
@BunsDev BunsDev deleted the okcode/rebase-before-commit branch April 6, 2026 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant