git-yrs-merge by notplants.net · Tangled

notplants.net / git-yrs-merge

wip: was testing using yrs as a merge driver for git conflicts

Rust 92%

Shell 8%

Use minor release version 0.2.0

8656ae79 notplants-bot · 3w ago

Bump git-yrs-merge to 0.1.1

3b0102bc notplants-bot · 3w ago

sidecar-off test tolerated a merge that never ran

328cdcbe notplants-bot · 2mo ago

add/add test tolerated a failed merge

090aa187 notplants-bot · 2mo ago

tests: cover the merge fallbacks, refresh, and diff deletions

125848ee notplants-bot · 2mo ago

tests: pin init's .gitattributes handling

ce087a50 notplants-bot · 2mo ago

re-running `init` keeps appending duplicate blocks to .gitattributes

f0012e06 notplants-bot · 2mo ago

tests: pin that unrelated sidecars do not duplicate the document

867e8463 notplants-bot · 2mo ago

merging two independently-generated sidecars duplicates the whole document

8e83301c notplants-bot · 2mo ago

tests: pin that the sidecar merge actually runs

ac556149 notplants-bot · 2mo ago

main · 3w ago Default