Show specific diverged workflows in sandbox merge dialog#4396
Open
midigofrank wants to merge 2 commits intomainfrom
Open
Show specific diverged workflows in sandbox merge dialog#4396midigofrank wants to merge 2 commits intomainfrom
midigofrank wants to merge 2 commits intomainfrom
Conversation
Add diverged_workflows/2 function to return list of workflow names that have diverged between sandbox and target projects, rather than just a boolean flag. Update merge modal to display these specific workflow names in a bullet list when divergence is detected. This helps users make informed decisions about whether to proceed with a merge by showing exactly which workflows will be affected. Fixes #4001
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4396 +/- ##
==========================================
- Coverage 89.38% 89.33% -0.05%
==========================================
Files 425 425
Lines 20051 20061 +10
==========================================
- Hits 17923 17922 -1
- Misses 2128 2139 +11 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Collaborator
Author
|
@josephjclark let me know your thoughts on the wording |
- Remove dbg() call from diverged workflows conditional check - Extract duplicate diverged workflows logic into reusable helper function - Simplifies code maintenance by centralizing the workflow divergence check
Collaborator
|
Something is up here Frank - I see the warning even if the branches haven't diverged Divergence means that the parent project changed since the sandbox was forked. So the head version in the parent is not in the sandbox's history. |
josephjclark
reviewed
Feb 9, 2026
| @doc """ | ||
| Returns the list of workflow names that have diverged between source and target projects. | ||
|
|
||
| Compares version hashes for workflows with matching names. A workflow is considered |
Collaborator
There was a problem hiding this comment.
Yep:
A workflow is considered
diverged if it exists in both projects but has different version hashes.
this isn't quite right: a workflow is diverged if the parent head is not in the workflow's history.
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
2 participants
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.
Description
diverged_workflows/2function to return list of workflow names that have diverged between sandbox and target projectsFixes #4001
Validation steps
AI Usage
Please disclose whether you've used AI anywhere in this PR (it's cool, we just
want to know!):
You can read more details in our
Responsible AI Policy
Pre-submission checklist
/reviewwith Claude Code)
(e.g.,
:owner,:admin,:editor,:viewer)