Skip to content

Reorganize merge conflict intake and expandable summaries#96

Open
BunsDev wants to merge 1 commit intomainfrom
okcode/reorganize-conflict-intake
Open

Reorganize merge conflict intake and expandable summaries#96
BunsDev wants to merge 1 commit intomainfrom
okcode/reorganize-conflict-intake

Conversation

@BunsDev
Copy link
Copy Markdown
Contributor

@BunsDev BunsDev commented Mar 29, 2026

Summary

  • Reworked the merge conflict intake flow with a tighter layout, improved project/workspace presentation, and clearer conflict source guidance.
  • Added reusable ExpandableSummary UI for inline previews with an expandable markdown sheet for longer AI-generated text.
  • Extracted merge-conflict presentation logic into shared helpers for workspace labeling and pull request state styling.
  • Added coverage for the new summary component and updated logic and review utility tests.

Testing

  • Not run (PR content only).
  • Existing test coverage added/updated for ExpandableSummary, MergeConflictShell.logic, and reviewUtils.

- Extract shared merge-conflict logic into reusable helpers
- Add expandable summary preview sheets for long guidance text
- Refresh intake layout with tooltip help and improved workspace display
@vercel
Copy link
Copy Markdown

vercel bot commented Mar 29, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
okcode-marketing Building Building Preview Mar 29, 2026 6:47am

@github-actions github-actions bot added size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Mar 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant