WIP: upstream rebase conflict — manual resolution needed#14
Open
github-actions[bot] wants to merge 1 commit into
Open
WIP: upstream rebase conflict — manual resolution needed#14github-actions[bot] wants to merge 1 commit into
github-actions[bot] wants to merge 1 commit into
Conversation
github-actions
Bot
force-pushed
the
auto/rebase-conflict
branch
from
6e4d816 to
e7549fb
Compare
github-actions
Bot
changed the title
sunrunnerfire
added a commit
that referenced
this pull request
Jun 3, 2026
The rebase script (both before and after the 4-submodule generalization) snapshotted the *working tree* to build the replay series, assuming apply-patches.sh had run first. In CI the submodules are checked out at their pinned SHAs with no patches applied, so the snapshot was empty: the script reset to upstream and then 'git am'-ed an empty series, producing a spurious conflict on every run. The original PR #14 'conflict' was this bug, not real upstream drift. Apply patches/<submodule>/*.patch directly onto the freshly-reset upstream via git am -3 — the committed patch files are the source of truth, no working-tree dependency. Preserve the curated patch filenames on regeneration (positional, since series order is stable) so doc references and the 0001/0002 numbering don't churn. Validated locally: clean apply onto the pinned base, filename preserved, content identical.
github-actions
Bot
force-pushed
the
auto/rebase-conflict
branch
from
e7549fb to
58e1722
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
scripts/rebase-upstream.shexited non-zero for at least onesubmodule. Manual hunk resolution required — see the affected
submodule working tree(s) for unmerged paths. The script log names
which submodule stopped and the
git am --continuerecovery steps.