Merge conflict resolution: sync-branch in config.yaml

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-11-30 11:16:50 -08:00
3 changed files with 89 additions and 81 deletions

File diff suppressed because one or more lines are too long