watson-16056-20260428072843-future-conflicts

[anduimagui]

Merge conflict detected

Original PR title: feat(app): add copy rich text option for message content

Detected: 2026-04-28T06:29:49.523Z

Watson Guidance

• Conflicting files: none captured; git conflict type cannot be identified from the provided evidence.
• Base branch version behavior in the conflicting file set cannot be summarized, because no conflicting file names, excerpts, or conflict hunks were provided.
• Head branch changes shown by the PR are non-conflict evidence only: it adds rich-text/plain-text message copy support, settings for copy mode, clipboard HTML/plain payload handling, and related tests across the listed packages/app and packages/ui files; no per-file conflict excerpt is provided.
• Safest resolution approach: first obtain the actual conflict list and merge hunks from Git/GitHub, then resolve only those named files line-by-line against the shown PR changes; after pushing, verify the merge builds, the affected copy/settings flows still work, and any touched tests pass. Small conflict-reduction suggestion: keep UI copy behavior changes and settings/layout changes in separate PRs when feasible.

Resolve locally

git fetch origin
git checkout feature-branch
git merge origin/main
# resolve conflicts
git push

[anduimagui]

Superseded by the repaired Watson comparison run (#12-#16).