You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Allow each organization member to use the same development branch name without colliding with another member's environment. Fixes#4320.
Fix
Development branches now use the existing member-scoped project, slug, and organization-member key for upserts. Preview branches retain their project-wide shortcode behavior.
New development branches receive distinct shortcodes while keeping their readable, member-scoped slugs. Existing branches continue to resolve through the member-scoped key, so this requires no migration or backfill.
Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.
This PR includes no changesets
When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types
Development branch upserts now generate member-scoped shortcodes using the branch slug and parent environment shortcode, require an organization member, and use an orgMemberId-based composite lookup key. Non-development branches retain their existing behavior. Tests cover concurrent creation by different members, shared slugs, distinct ownership, and idempotent retries.
🚥 Pre-merge checks | ✅ 4 | ❌ 1
❌ Failed checks (1 warning)
Check name
Status
Explanation
Resolution
Description check
⚠️ Warning
The description covers summary and fix, but it misses required template sections like Closes #issue, Checklist, Testing, Changelog, and Screenshots.
Add the missing template sections, including the issue link, checklist, testing steps, changelog, and screenshots placeholders.
✅ Passed checks (4 passed)
Check name
Status
Explanation
Linked Issues check
✅ Passed
The branch upsert changes let different members reuse the same dev branch name, matching #4320's collision fix.
Out of Scope Changes check
✅ Passed
The added test and changelog note are tied to the member-scoped dev branch fix, with no clear unrelated code changes.
Docstring Coverage
✅ Passed
No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Title check
✅ Passed
The title clearly summarizes the main change: scoping development branches to individual members.
✨ Finishing Touches📝 Generate docstrings
Create stacked PR
Commit on current branch
🧪 Generate unit tests (beta)
Create PR with unit tests
Commit unit tests in branch feature/tri-12255-bug-cannot-use-dev-branch-name-that-is-in-use-by-another
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
The reason will be displayed to describe this comment to others. Learn more.
✅ Devin Review: No Issues Found
Devin Review analyzed this PR and found no bugs or issues to report.
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
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
Allow each organization member to use the same development branch name without colliding with another member's environment. Fixes #4320.
Fix
Development branches now use the existing member-scoped project, slug, and organization-member key for upserts. Preview branches retain their project-wide shortcode behavior.
New development branches receive distinct shortcodes while keeping their readable, member-scoped slugs. Existing branches continue to resolve through the member-scoped key, so this requires no migration or backfill.