Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
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
Resources
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
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search
/
Sign in
Sign up
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
{{ message }}
atomicdotdev
atomic
Repository navigation
Code
Issues
2
(2)
Pull requests
10
(10)
Discussions
Actions
Projects
Security and quality
Insights
More
items
Merge integrity: fix record-layer duplication, persist conflict state, add merge rubric
- #157
#157
Merged
graywolf336
merged 6 commits into
dev
atomicdotdev/atomic:dev
from
fix/merge-ordering-duplication
atomicdotdev/atomic:fix/merge-ordering-duplication
Copy head branch name to clipboard
Aug 11, 2026
Conversation
Commits
6
(6)
Checks
Files changed
Merged
Merge integrity: fix record-layer duplication, persist conflict state, add merge rubric
#157
graywolf336
merged 6 commits into
dev
atomicdotdev/atomic:dev
from
fix/merge-ordering-duplication
atomicdotdev/atomic:fix/merge-ordering-duplication
Copy head branch name to clipboard
Commits
Commits on Aug 7, 2026
test(harness): cover merge ordering and content duplication
Show description for 29accab
graywolf336
committed
29accab
View commit details
Copy full SHA for 29accab
Browse repository at this point
fix(record): stop rewriting shifted equals into replaces; map hunk lines via SCC order
Show description for a3a2291
graywolf336
committed
a3a2291
View commit details
Copy full SHA for a3a2291
Browse repository at this point
test(harness): renumber merge ordering suite to 27 to avoid collision with 26_vault_intent_inherit
graywolf336
committed
40d6937
View commit details
Copy full SHA for 40d6937
Browse repository at this point
style: apply rustfmt
graywolf336
committed
6168e9a
View commit details
Copy full SHA for 6168e9a
Browse repository at this point
Commits on Aug 10, 2026
rubrik for merge states
leefaus
committed
70f34c8
View commit details
Copy full SHA for 70f34c8
Browse repository at this point
Commits on Aug 11, 2026
fix remotes
leefaus
committed
6ac2f2b
View commit details
Copy full SHA for 6ac2f2b
Browse repository at this point
You can’t perform that action at this time.
