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
main
Branches
main
default
Tags
No tags found
View all branches
View all tags
13
1
0
Code
Clone this repository
Use permalink
HTTPS
https://tangled.org/notplants.net/git-yrs-merge
SSH
git@tangled.org:notplants.net/git-yrs-merge
For self-hosted knots, clone URLs may differ based on your setup.
tar.gz
.zip
Files
e2e-tests
8mo ago
src
4mo ago
tests
4mo ago
.gitignore
8mo ago
Cargo.lock
2mo ago
Cargo.toml
2mo ago
Commits
13
Use minor release version 0.2.0
notplants-bot
·
2mo ago
8656ae79
Copied
Failed
Copy SHA
Bump git-yrs-merge to 0.1.1
notplants-bot
·
2mo ago
3b0102bc
Copied
Failed
Copy SHA
sidecar-off test tolerated a merge that never
ran
ran
notplants-bot
·
4mo ago
328cdcbe
Copied
Failed
Copy SHA
Branches
1
main
·
2mo ago
Default
Languages
Rust
92%
Shell
8%