fix: unique foxops branch names to prevent stale branch collisions#586
Open
peterbraden wants to merge 1 commit into
Open
fix: unique foxops branch names to prevent stale branch collisions#586peterbraden wants to merge 1 commit into
peterbraden wants to merge 1 commit into
Conversation
… collisions
Branch names for MR changes are deterministic: foxops/update-to-{hash}-{version}.
When an MR is closed without merging, GitLab does not delete the source branch.
A subsequent update to the same version generates the same branch name, causing
a push failure because the remote already has that branch with diverging history.
Adding a short uuid suffix to the branch name prevents collisions entirely,
without requiring branch deletion API calls.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
3 tasks
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.
Summary
foxops/update-to-{hash}-{version}. When an MR is closed without merging, the source branch persists on the remote. A subsequent update to the same version generates the same name, causing a push failure withRebaseRequiredError.Related to #584 (root cause 2: stale branch scenario).