merge: unify origin/main into local main via per-commit cherry-pick reconciliation

Browse source

Reconciled the 26 autocommit-origin commits from apricot (autocommit@ftw.codes)
that had landed on origin/main. Each was cherry-picked onto local main; 5 added
new content (refactor combat_utils, remove occupation penalty, AutoPlay class,
capture_city/eliminate, mc-turn formation+policy), 21 were content-empty
because local had already evolved the same files independently.

Conflicts during reconciliation were all 'HEAD strictly newer' — local had
superset fields, additional struct members, expanded docs, refactored modules.
The ours-merge records origin/main as merged without changing the tree.

Branches preserved:
- backup/local-main (5d3144142) — original local 77-ahead snapshot
- backup/origin-main (be10e2f24) — original origin/main 26-ahead snapshot

...

This commit is contained in:

Natalie 2026-05-02 21:47:44 -04:00

parent ae9de3186f be10e2f248

commit aa109f0fdb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available