[APP-2111] fork base and add release commit atomically #215
Conversation
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
added 2 commits
August 9, 2025 13:02
meorphis
changed the title
dgellow
approved these changes
Aug 11, 2025
Member
dgellow
left a comment
dgellow
left a comment
There was a problem hiding this comment.
Thanks for digging into that issue, that's an annoying one :(
dgellow
reviewed
Aug 11, 2025
src/github.ts
Outdated
| 'updated existing branch' | ||
| ); | ||
| } catch (error) { | ||
| if ( |
Member
There was a problem hiding this comment.
nit: can we extract that check to a small function?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
We've been running into issues where
commitAndPushruns into a 422 from GitHub for some unknown reason (I wrote to their support and didn't hear back) and we leave the repo in a state where the release commit is missing. And then if/when we retry, the PR title does not match the manifest (because the release commit is missing) so we think that the user edited the PR title.I tried to mitigate the latter problem with #212 but that caused more issues https://stainless-workspace.slack.com/archives/C06H02ZA5BM/p1754677699040689 so I'm reverting it here.
I've implemented a better fix: just fork
nextand add the release commit atomically rather than as two separate updates to the release branch.Test Plan
I deployed this to staging and verified that it works as intended.