beads/internal/config
beads/crew/lydia 9a9704b451 feat(sync): add per-field merge strategies for conflict resolution
Implements configurable per-field merge strategies (hq-ew1mbr.11):

- Add FieldStrategy type with strategies: newest, max, union, manual
- Add conflict.fields config section for per-field overrides
- compaction_level defaults to "max" (highest value wins)
- estimated_minutes defaults to "manual" (flags for user resolution)
- labels defaults to "union" (set merge)

Manual conflicts are displayed during sync with resolution options:
  bd sync --ours / --theirs, or bd resolve <id> <field> <value>

Config example:
  conflict:
    strategy: newest
    fields:
      compaction_level: max
      estimated_minutes: manual
      labels: union

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-21 19:40:39 -08:00
..
config.go feat(sync): add per-field merge strategies for conflict resolution 2026-01-21 19:40:39 -08:00
config_test.go feat(sync): add per-field merge strategies for conflict resolution 2026-01-21 19:40:39 -08:00
repos.go fix: bd repo commands write to YAML and cleanup on remove (#683) 2025-12-22 01:26:45 -08:00
repos_test.go fix: bd repo commands write to YAML and cleanup on remove (#683) 2025-12-22 01:26:45 -08:00
sync.go feat(sync): add per-field merge strategies for conflict resolution 2026-01-21 19:40:39 -08:00
sync_test.go feat(sync): add per-field merge strategies for conflict resolution 2026-01-21 19:40:39 -08:00
yaml_config.go fix: Validate sync-branch at config-time and runtime (closes #1166) (#1168) 2026-01-19 10:11:06 -08:00
yaml_config_test.go fix: Validate sync-branch at config-time and runtime (closes #1166) (#1168) 2026-01-19 10:11:06 -08:00