Skip to content

Rebasebot merge onboard #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
RadekManak wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Rebasebot merge onboard #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3bb8896
rebase: preserve merge-only deltas from downstream manual merges
RadekManak Jun 25, 2026
6d7d7d9
rebase: preserve merge-only carry order
RadekManak Jun 25, 2026
7a1ae4d
rebase: extend merge-only delta recovery to first-run onboarding path
RadekManak Jun 25, 2026
cc9bb1b
rebase: harden merge-only delta recovery
RadekManak Jun 25, 2026
3286ded
tests: lock in operator-visibility log assertions for merge-only delt…
RadekManak Jun 25, 2026
1b4fd8d
rebase: tighten merge-only delta detection
RadekManak Jun 25, 2026
d96f8f2
rebase: narrow synthetic merge detection
RadekManak Jun 25, 2026
5e7d09b
rebase: fail closed on partial merge-only carry recovery
RadekManak Jul 1, 2026
8c3ac4b
Merge origin/main into rebasebot-merge-onboard
RadekManak Jul 1, 2026
cf0278a
fix: restrict bot email normalization to GitHub noreply
RadekManak Jul 3, 2026
3915fc5
rebase: simplify merge-only replay helpers
RadekManak Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading