notplants.net / git-yrs-merge
wip: was testing using yrs as a merge driver for git conflicts
Star
Fork 0
Watch

Commits on main

Use minor release version 0.2.0 main
notplants-bot committed
Bump git-yrs-merge to 0.1.1
notplants-bot committed
sidecar-off test tolerated a merge that never ran
notplants-bot committed
add/add test tolerated a failed merge
notplants-bot committed
tests: cover the merge fallbacks, refresh, and diff deletions
notplants-bot committed
tests: pin init's .gitattributes handling
notplants-bot committed
re-running `init` keeps appending duplicate blocks to .gitattributes
notplants-bot committed
tests: pin that unrelated sidecars do not duplicate the document
notplants-bot committed
merging two independently-generated sidecars duplicates the whole document
notplants-bot committed
tests: pin that the sidecar merge actually runs
notplants-bot committed
the lossless sidecar merge never runs; every merge silently uses the diff fallback
notplants-bot committed
test infra: drive the real merge driver from real git repos
notplants-bot committed
initial git-yrs-merge
notplants committed