alpha
Login
Join now
notplants.net
/
git-yrs-merge
Star
Starred
Star
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
Something went wrong. Try again.
Fork
0
Eye filled
Watch
Watching
Watch
Overview
Overview
Issues
Issues
Pulls
Pulls
Pipelines
Pipelines
git-yrs-merge
/
tests
1 folder
·
4 files
at
main
notplants-bot
·
sidecar-off test tolerated a merge that never ran
·
2mo ago
328cdcbe
common
test infra: drive the real merge driver from real git repos
2mo ago
e2e_tests.rs
initial git-yrs-merge
6mo ago
init_cmd.rs
tests: pin init's .gitattributes handling
2mo ago
merge_driver.rs
sidecar-off test tolerated a merge that never ran
2mo ago
refresh_cmd.rs
tests: cover the merge fallbacks, refresh, and diff deletions
2mo ago