Sandbox merge no longer deletes a parent workflow added after the fork#4940
Open
elias-ba wants to merge 1 commit into
Open
Sandbox merge no longer deletes a parent workflow added after the fork#4940elias-ba wants to merge 1 commit into
elias-ba wants to merge 1 commit into
Conversation
|
The diff is confined to sandbox merge UX changes: relabeling deletion states, defaulting target-only workflows to unchecked (safer), and adding an Security Review ✅
|
A workflow added to a project after a sandbox was branched was flagged for deletion and pre-selected on the sandbox merge screen, so a routine merge could silently delete it. Workflows present in the project but not the sandbox now default to unchecked (deletion is opt-in), the merge no longer takes the merge-everything-and-delete-unmatched path, and the merge screen labels those rows honestly instead of "Deleted in sandbox".
c3f4cfb to
d881a42
Compare
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
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
This PR fixes a data-loss bug in the sandbox merge. A workflow added to a project after a sandbox was branched was flagged for deletion and pre-selected on the merge screen, so a routine merge could silently delete it. Workflows present in the project but not in the sandbox now default to unchecked, so deletion is opt-in and anything left unchecked is kept. Those rows are also labelled honestly, distinguishing a workflow added after the fork from one that existed but is absent from the sandbox. The merge logic itself is unchanged; this only touches the merge screen.
Closes #4919
Validation steps
Additional notes for the reviewer
The merge logic is unchanged; this only affects the merge screen's defaults and which workflows are selected.
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)