Repository navigation
docs: fix what merge() does in the entity versioning guide - #2628
Merged
Su (sushmangupta) merged 3 commits intoOct 23, 2026
Merged
Conversation
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Developer Docs healthcheckStatus: Completed with |
Developer Docs healthcheckStatus: Running. |
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Su (sushmangupta)
requested review from
Jonas Elfering (keulinho) and
Michael Telgmann (mitelg)
October 22, 2026 15:09
Jonas Elfering (keulinho)
approved these changes
Oct 23, 2026
Contributor
📢 Developer Announcement RecommendationRecommendation: ❌ No Announcement Recommended No developer announcement signals were detected.
|
Su (sushmangupta)
deleted the
fix/docs-versioning-entities-merge-behavior
branch
October 23, 2026 12:14
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.
Summary
versioning-entities.mddescribesmergein two places: line 55 says "all versions before the merged version are deleted", and line 112 saysmerge"deletes all versions before this one", followed on line 113 by "The merged version is now our new live version."VersionManager::merge()the target is the version of the context that is passed in ($targetVersionId = $writeContext->getContext()->getVersionId();, L169). The merged version's changes are written into that target (executeWrites($writes, $targetContext)), anddeleteClones()then removes the records that carry the merged$versionId.updateVersionData()also deletes the merged version itself (// delete version). Nothing inmerge()deletes other versions.merge()uses. No other lines change.Related links
versioning-entities.mdL112-L113versioning-entities.mdL55-L55v6.7.15.1):VersionManager.phpL169: The target of the merge is the version of the context passed tomerge(), not an older version.VersionManager.phpL203-L210:merge()writes the version's changes into the target context, then deletes the merged version's own versioned records.VersionManager.phpL993-L995:deleteClonesdeletes the entity records that carry the merged$versionId, and no other versions.VersionManager.phpL969-L970:updateVersionData()deletes the merged version row after writing the merge commit.Checklist
PageRefreferences where relevant. (Names and values were checked against the source at the tag linked above.).gitbook.yamlif pages were moved, renamed, or deleted. (N/A, no page moved.).wordlist.txt(and sorted it) if spellcheck flags new legitimate terms. (No new prose words.)Notes
mergedeletes and which version becomes the live one.VersionManager::merge()does something different: it writes the merged version's changes into the version of the context passed in and deletes the merged version together with its records.v6.7.15.1):src/Core/Framework/DataAbstractionLayer/VersionManager.phpL169-L169;src/Core/Framework/DataAbstractionLayer/VersionManager.phpL203-L210;src/Core/Framework/DataAbstractionLayer/VersionManager.phpL993-L995;src/Core/Framework/DataAbstractionLayer/VersionManager.phpL969-L970.shopware/shopwareat tagv6.7.15.1, then two independent AI verification passes that re-read the page and the cited source files. Please check the cited lines yourself before merging.main(Shopware 6.7) only. Older docs branches are not touched.🤖 Generated with Claude Code