Repository navigation
Conversation
|
Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch.
|
…view posAtDOM cannot see inside a conflict node view, so indices on conflict content pointed at the conflict node and clicking it mounted the upstream side. The preview body now omits them; the outline keeps the indexed body. Co-authored-by: pi coding agent
…the banner Conflicts now allow content and split views only. Layout is disabled, and a layout view moves to split when conflicts appear. The split preview stays read-only and highlighted. Co-authored-by: pi coding agent
Co-authored-by: pi coding agent
The preview shows the local, upstream or word-diff side of a conflict to match the tab open in the doc pane. Block pairs stay on local for the diff. Co-authored-by: pi coding agent
Co-authored-by: pi coding agent
Contributor
Author
shsteimer
marked this pull request as ready for review
November 19, 2026 15:24
Co-authored-by: pi coding agent
This branch was successfully deployed
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.

Allow Split view on pages with LOC/MSM merge conflicts. Layout stays disabled while conflicts exist; the split preview is highlighted, read-only, and follows each conflict's open tab until conflicts are resolved in the doc pane. Paired with adobe/da-nx#970 (must release first).
Refs #1144
data-diff="local|upstream";prose2aemkeeps it through block, list-item and image conversion.SET_READ_ONLYto the iframe, host dropsnode-update/image-replace(undo/redo kept), block toolbar hidden, selection toolbar limited to Comment, drops into the preview refused.mergeConflictsStatereplays and is cleared on doc teardown.Reviewer notes
has-conflictsattribute and its CSS dimming the left panel are unchanged.Testing against this da-nx branch
tools/quick-edit/quick-edit.jsreadsquick-edit=<branch>(e.g. Frescopa) load the branch via the URL below.da-universalbootstrap (most customer projects) hardcodehttps://da.live/nx/public/plugins/quick-edit/quick-edit.jsand ignore the param, so the iframe runs production quick-edit (no highlight, preview not read-only). Use a DevTools local override (Sources > Overrides) on that URL with:Test URLs (page with merge conflicts;
quick-edit=<branch>loads this da-nx branch in the iframe on frescopa):