Skip to content

Navigation Menu

Appearance settings

- AI CODE CREATION
  GitHub CopilotWrite better code with AI
  GitHub Copilot appDirect agents from issue to merge
  MCP Registry^NewIntegrate external tools
- DEVELOPER WORKFLOWS
  ActionsAutomate any workflow
  CodespacesInstant dev environments
  IssuesPlan and track work
  Code ReviewManage code changes
- APPLICATION SECURITY
  GitHub Advanced SecurityFind and fix vulnerabilities
  Code securitySecure your code as you build
  Secret protectionStop leaks before they start
- EXPLORE
  Why GitHub
  Documentation
  Blog
  Changelog
  Marketplace
View all features
- BY COMPANY SIZE
  Enterprises
  Small and medium teams
  Startups
  Nonprofits
- BY USE CASE
  App Modernization
  DevSecOps
  DevOps
  CI/CD
  View all use cases
- BY INDUSTRY
  Healthcare
  Financial services
  Manufacturing
  Government
  View all industries
View all solutions
- EXPLORE BY TOPIC
  AI
  Software Development
  DevOps
  Security
  View all topics
- EXPLORE BY TYPE
  Customer stories
  Events & webinars
  Ebooks & reports
  Business insights
  GitHub Skills
- SUPPORT & SERVICES
  Documentation
  Customer support
  Community forum
  Trust center
  Partners
View all resources
- COMMUNITY
  GitHub SponsorsFund open source developers
- PROGRAMS
  Security Lab
  Maintainer Community
  Accelerator
  GitHub Stars
  Archive Program
- REPOSITORIES
  Topics
  Trending
  Collections
- ENTERPRISE SOLUTIONS
  Enterprise platformAI-powered developer platform
- AVAILABLE ADD-ONS
  GitHub Advanced SecurityEnterprise-grade security features
  Copilot for BusinessEnterprise-grade AI features
  Premium SupportEnterprise-grade 24/7 support
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

ceramicnetwork / rust-ceramic Public

Notifications You must be signed in to change notification settings
Fork 19
Star 51

Code
Issues 17
Pull requests 9
Actions
Projects
Security and quality
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security and quality
Insights

feat: conflict resolution scaffolding#687

Merged

smrz2001 merged 19 commits into

mainceramicnetwork/rust-ceramic:mainfrom

feat/conflict-resolutionceramicnetwork/rust-ceramic:feat/conflict-resolutionCopy head branch name to clipboard

May 26, 2025

Conversation Commits19 (19)Checks Files changed

Merged

feat: conflict resolution scaffolding#687
smrz2001 merged 19 commits into
mainfrom
feat/conflict-resolution

Commits

Commits on May 26, 2025

wip: adds scaffold for resolver actor

nathanielc
authored and
smrz2001
committed
wip: add concluder todos

nathanielc
authored and
smrz2001
committed
more notes

nathanielc
authored and
smrz2001
committed
chore: move blockchain module into event-svc crate

dav1do
authored and
smrz2001
committed
feat: store chain timestamp proof data in db and read in pipeline for conclusion events

dav1do
authored and
smrz2001
committed
feat: validate time events and propagate proofs through aggregator
smrz2001
committed
fix: rename meta_data -> metadata
smrz2001
committed
fix: typo in comment

smrz2001
and
stbrody
committed
fix: rename time_event_verifier -> time_event_validator
smrz2001
committed
fix: update comment
smrz2001
committed
fix: return error when time proof isn't found
smrz2001
committed
fix: update conclusions test
smrz2001
committed
fix: update migration tests
smrz2001
committed
fix: add before/chain_id to pipeline tests
smrz2001
committed
fix: disable composedb and go-rust migration tests
smrz2001
committed
fix: remove experimental features test config
smrz2001
committed
chore: update comment

smrz2001
and
stbrody
committed
fix: review comments
smrz2001
committed
chore: todo for adding transient validation errors
smrz2001
committed

Footer

© 2026 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.