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 }}
NovusEdge
docket
Repository navigation
Code
Issues
1
(1)
Pull requests
Discussions
Actions
Projects
Security and quality
Insights
More
items
Ledger merge driver
- #26
#26
Merged
NovusEdge
merged 7 commits into
main
NovusEdge/docket:main
from
feat/merge-driver
NovusEdge/docket:feat/merge-driver
Copy head branch name to clipboard
Oct 2, 2026
Conversation
Commits
7
(7)
Checks
Files changed
Merged
Ledger merge driver
#26
NovusEdge
merged 7 commits into
main
NovusEdge/docket:main
from
feat/merge-driver
NovusEdge/docket:feat/merge-driver
Copy head branch name to clipboard
Commits
Commits on Oct 2, 2026
rebase: match incoming records across renumbering
Show description for 892cd62
NovusEdge
committed
892cd62
View commit details
Copy full SHA for 892cd62
Browse repository at this point
Add docket merge-driver, a git merge driver for the ledger
Show description for 53bf12d
NovusEdge
committed
53bf12d
View commit details
Copy full SHA for 53bf12d
Browse repository at this point
Use the merge driver for this repository's ledger and document it
Show description for b273624
NovusEdge
committed
b273624
View commit details
Copy full SHA for b273624
Browse repository at this point
init: register the ledger merge driver; brief when a clone lacks it
Show description for e62b890
NovusEdge
committed
e62b890
View commit details
Copy full SHA for e62b890
Browse repository at this point
init: register only merge.docket.driver, report a failed registration, survive a non-UTF-8 .gitattributes
Show description for 6d25960
NovusEdge
committed
6d25960
View commit details
Copy full SHA for 6d25960
Browse repository at this point
merge-driver: always leave conflict markers and append without rewriting OURS
Show description for e527f89
NovusEdge
committed
e527f89
View commit details
Copy full SHA for e527f89
Browse repository at this point
docs: merge driver remap limits, ancestor rule, unregistered clones
Show description for 71286e0
NovusEdge
committed
71286e0
View commit details
Copy full SHA for 71286e0
Browse repository at this point
You can’t perform that action at this time.
