Skip to content

chore(repo): back-merge main into dev - #2506

Closed
ankit-yc wants to merge 1 commit into
devfrom
main
Closed

chore(repo): back-merge main into dev#2506
ankit-yc wants to merge 1 commit into
devfrom
main

Conversation

@ankit-yc

Copy link
Copy Markdown
Contributor

Restores the invariant that dev contains main.

main is 1 commit ahead: 7f92970d8, the merge commit from promotion #2505. A promotion's own merge commit can never carry itself back, so every promotion re-opens this gap by exactly one commit.

The diff is empty - GitHub reports 0 files changed. main brings nothing to dev; this exists solely so git merge-base --is-ancestor main dev passes again, which is the check that distinguishes "everything is promoted" from "something reached main without passing through dev".

Opened by hand because back-merge.yml cannot open it itself. Run 32859463041 fired correctly and reported:

main has 1 commit(s) that dev does not contain.
credential: GITHUB_TOKEN
::error::dev no longer contains main, and this workflow cannot open the
         back-merge pull request itself.

GITHUB_TOKEN is refused because can_approve_pull_request_reviews is false at both repository and organisation level. That setting should stay off: it also lets a workflow APPROVE pull requests. Adding a BACKMERGE_TOKEN secret (a PAT with pull-requests: write) makes this automatic - the workflow already prefers it when present.

Merge with a merge commit, not a squash. A squash creates a new commit and leaves the ancestry broken, which is the problem this exists to fix.

chore(repo): promote dev to main
@ankit-yc

Copy link
Copy Markdown
Contributor Author

Closing so back-merge.yml can create this itself, as an end-to-end test of the new BACKMERGE_TOKEN. The token was added minutes ago; the PR-creation path is the one that failed before, so it is worth proving rather than assuming. If the workflow cannot do it, I will reopen this.

@ankit-yc ankit-yc closed this Aug 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant