fix(apply): update existing draft on create conflict [COPS-1687]#1359
Open
Marco Link (marcolink) wants to merge 1 commit into
Open
fix(apply): update existing draft on create conflict [COPS-1687]#1359Marco Link (marcolink) wants to merge 1 commit into
Marco Link (marcolink) wants to merge 1 commit into
Conversation
Marco Link (marcolink)
changed the title
Marco Link (marcolink)
marked this pull request as ready for review
June 18, 2026 09:32
Marco Link (marcolink)
force-pushed
the
fix/HK-0000-draft-entry-create-fallback
branch
from
June 18, 2026 09:33
4e40358 to
24659ac
Compare
Ramsay Shiells (ramsay-shiells)
changed the title
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
Handle add-item create conflicts caused by draft-only entries already existing in the target environment. When CMA create returns a version mismatch, the apply flow now loads the target entry, verifies it is an unpublished same-content-type entry, updates it with source fields, publishes it, and tracks it as a successful add.
Why
The changeset generator uses CDA, so target entries that were never published are invisible during diffing and get classified as additions. Applying those additions via CMA can then fail because the target draft already exists.
Risk and Rollout
Low risk. Fallback is limited to VersionMismatch create failures and refuses published entries or content type mismatches. Rollback by reverting the commit.
Ticket