Something went wrong. Try again.
Identities for entities did.bot
agent llm did
Something went wrong. Try again.
123456789101112131415161718192021222324252627282930#!/usr/bin/env bash# Resolve plan/ conflicts left by a merge or rebase.## plan/README.md's tables are generated, so a textual conflict in them carries# no information: regenerating is the resolution. plan/order.txt union-merges# via .gitattributes and needs nothing here, but is checked so a duplicated id# is caught rather than silently doubling a row.set -euo pipefailcd "$(dirname "$0")/.."
if grep -qE '^(<<<<<<<|>>>>>>>)' plan/README.md 2>/dev/null; then # Take either side wholesale; the regeneration below is what makes it right. git checkout --ours plan/README.md 2>/dev/null || truefi
python3 scripts/gen-plan-readme.pypython3 scripts/check-plan.pypython3 scripts/gen-plan-readme.py --check
dupes=$(grep -vE '^\s*(#|$)' plan/order.txt | sort | uniq -d)if [ -n "$dupes" ]; then echo "plan/order.txt has duplicate ids after the union merge:" >&2 echo "$dupes" >&2 echo "remove one of each, then rerun." >&2 exit 1fi
git add plan/README.md plan/order.txtecho "plan/ resolved: README regenerated, order.txt checked."