# plan/order.txt is a flat list of ids, advisory, and append-friendly: two # branches adding epics touch different lines of one file for no reason other # than both being lists. A union merge keeps both sides' lines, which is the # right answer for a file with no cross-line meaning. Duplicate ids would be a # problem, but two branches never add the same epic. plan/order.txt merge=union # plan/README.md's tables are generated from plan/*.md by # scripts/gen-plan-readme.py; only the prose outside the fences is written by # hand. Merging generated rows textually produces conflicts that carry no # information, so this driver keeps one side and the regeneration below makes # it correct. Register it once per clone: # # git config merge.plan-readme.name "keep one side; scripts/gen-plan-readme.py makes it true" # git config merge.plan-readme.driver "true" # # then, after any merge or rebase that touched plan/: # # python3 scripts/gen-plan-readme.py && git add plan/README.md # # scripts/resolve-plan.sh does both. prek's `plan register` hook runs # gen-plan-readme.py --check, so a stale table cannot be committed unnoticed. plan/README.md merge=plan-readme