Skip to content

Comments

Chore/fix conflicting branches#637

Merged
andyguzmaneth merged 4 commits intomainfrom
chore/fix-conflicting-branches
Feb 19, 2026
Merged

Chore/fix conflicting branches#637
andyguzmaneth merged 4 commits intomainfrom
chore/fix-conflicting-branches

Conversation

@vplasencia
Copy link
Member

Description

This PR solves this branch errors: #629

Copilot AI review requested due to automatic review settings February 19, 2026 14:49
@vercel
Copy link

vercel bot commented Feb 19, 2026

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

Project Deployment Actions Updated (UTC)
website-v2-production Ready Ready Preview Feb 19, 2026 2:49pm

Request Review

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Resolves the branch conflict described in #629 by reordering mastermap project entries and aligning the Machina iO project with the intended “Private Writes” category.

Changes:

  • Moved TLSNOTARY and the “Verifiable Compute” project entry to the end of the “Private Proving” section (before the “Private Writes” divider).
  • Updated “Machina iO” to use category: "private-writes".

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@andyguzmaneth andyguzmaneth merged commit 8b2cb7d into main Feb 19, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants