ci: leave comment and abort early if commit already exists on target branch in backport workflow #6326
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
…t branch Fixes confusing "merge conflicts detected" message when commit already exists on target branch. Now checks if commit exists on target before attempting cherry-pick and provides clear message: "Commit already exists on branch, no backport needed."
dosubot
bot
added
the
size:S
🎭 Playwright Test Results⏰ Completed at: 10/27/2025, 06:23:57 AM UTC 📈 Summary
📊 Test Reports by Browser
🎉 Click on the links above to view detailed test results for each browser configuration. |
🎨 Storybook Build Status✅ Build completed successfully! ⏰ Completed at: 10/27/2025, 06:00:53 AM UTC 🔗 Links🎉 Your Storybook is ready for review! |
christian-byrne
changed the title
Bundle Size ReportSummary
Category Glance Per-category breakdownApp Entry Points — 3.29 MB (baseline 3.29 MB) • ⚪ 0 BMain entry bundles and manifests
Graph Workspace — 721 kB (baseline 721 kB) • ⚪ 0 BGraph editor runtime, canvas, workflow orchestration
Views & Navigation — 8.15 kB (baseline 8.15 kB) • ⚪ 0 BTop-level views, pages, and routed surfaces
Panels & Settings — 294 kB (baseline 294 kB) • ⚪ 0 BConfiguration panels, inspectors, and settings screens
UI Components — 12.3 kB (baseline 12.3 kB) • ⚪ 0 BReusable component library chunks
Data & Services — 10 kB (baseline 10 kB) • ⚪ 0 BStores, services, APIs, and repositories
Utilities & Hooks — 1.07 kB (baseline 1.07 kB) • ⚪ 0 BHelpers, composables, and utility bundles
Vendor & Third-Party — 5.36 MB (baseline 5.36 MB) • ⚪ 0 BExternal libraries and shared vendor chunks
Other — 2.55 MB (baseline 2.55 MB) • ⚪ 0 BBundles that do not match a named category
|
christian-byrne
deleted the
fix/backport-workflow-detect-existing-commits
branch
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.
Follow up on #6317: Fixes confusing "merge conflicts detected" message when commit already exists on target branch (e.g., PRs #6294 and #6307).
Changes
already-existsfor this caseBefore
When a commit already existed on the target branch, users would see:
This was confusing because there were no actual conflicts - the commit was already present.
After
Users now see:
┆Issue is synchronized with this Notion page by Unito