About
Resources
Blog
Docs
Source
Status
Social
Discord
IRC
Bluesky
X/Twitter
Contact
team@tangled.org
security@tangled.org
Legal
Terms of Service
Privacy Policy
Sign in
Join now
git-yrs-merge
notplants.net
/
Star
Starred
Star
0
Something went wrong. Try again.
Fork
0
Eye filled
Watch
Watching
Watch
wip: was testing using yrs as a merge driver for git conflicts
Star
Starred
Star
0
Something went wrong. Try again.
Fork
0
Eye filled
Watch
Watching
Watch
Overview
Overview
Issues
Issues
Pulls
Pulls
Pipelines
Pipelines
git-yrs-merge
/
src
7 files
at
main
notplants-bot
·
tests: cover the merge fallbacks, refresh, and diff deletions
·
4mo ago
125848ee
crdt_merge.rs
tests: pin that unrelated sidecars do not duplicate the document
4mo ago
diff_merge.rs
tests: cover the merge fallbacks, refresh, and diff deletions
4mo ago
init.rs
re-running `init` keeps appending duplicate blocks to .gitattributes
4mo ago
lib.rs
initial git-yrs-merge
8mo ago
main.rs
initial git-yrs-merge
8mo ago
refresh.rs
initial git-yrs-merge
8mo ago
sidecar.rs
tests: pin that the sidecar merge actually runs
4mo ago