Skip to content

Merge Conflict Ui#356

Open
fat wants to merge 4 commits intomainfrom
fat/merge-conflict
Open

Merge Conflict Ui#356
fat wants to merge 4 commits intomainfrom
fat/merge-conflict

Conversation

@fat
Copy link
Contributor

@fat fat commented Feb 25, 2026

Lots of people asking for this…

CleanShot.2026-02-24.at.22.31.12.mp4

@vercel
Copy link

vercel bot commented Feb 25, 2026

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

Project Deployment Actions Updated (UTC)
pierrejs-diff-demo Ready Ready Preview Feb 25, 2026 6:21pm
pierrejs-docs Ready Ready Preview Feb 25, 2026 6:21pm

Request Review

@amadeus
Copy link
Member

amadeus commented Feb 25, 2026

can you write a bit about the architecture on this? to help me review it better?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants