Merge conflict detected
Original PR title: feat(app): add copy rich text option for message content
Detected: 2026-04-28T06:28:56.276Z
Watson Guidance
- Conflicting files: none captured in the provided evidence, so the exact file path(s) and git conflict type cannot be determined.
- Base-branch behavior in the conflicting file(s) cannot be summarized because no conflict excerpts or per-file base-side hunks were provided.
- Head-branch behavior in the conflicting file(s) cannot be summarized because no conflict excerpts or per-file head-side hunks were provided.
- Safest resolution: open the actual merge conflict in git/GitHub, resolve only the reported file(s) from the conflict markers, then after pushing verify the merge is clean and that the touched copy/settings files still pass the project validation and relevant tests.
Resolve locally
git fetch origin
git checkout feature-branch
git merge origin/main
# resolve conflicts
git push
Merge conflict detected
Original PR title: feat(app): add copy rich text option for message content
Detected: 2026-04-28T06:28:56.276Z
Watson Guidance
Resolve locally
git fetch origin git checkout feature-branch git merge origin/main # resolve conflicts git push