Skip to content

Reorganize merge conflict intake and expandable summaries#96

Merged
BunsDev merged 1 commit into
mainfrom
okcode/reorganize-conflict-intake
Mar 31, 2026
Merged

Reorganize merge conflict intake and expandable summaries#96
BunsDev merged 1 commit into
mainfrom
okcode/reorganize-conflict-intake

Conversation

@BunsDev
Copy link
Copy Markdown
Member

@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
@BunsDev BunsDev merged commit 03ac540 into main Mar 31, 2026
8 of 9 checks passed
@BunsDev BunsDev deleted the okcode/reorganize-conflict-intake branch March 31, 2026 21:00
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