Repository navigation

Merge project.pbxproj by union of added entries instead of by line - #15419

Merged

teamleaderleo merged 27 commits into

manaflow-ai:mainfrom

teamleaderleo:feat/pbxproj-merge-driver

Sep 28, 2026

Merged

Merge project.pbxproj by union of added entries instead of by line#15419
teamleaderleo merged 27 commits into
manaflow-ai:mainfrom
teamleaderleo:feat/pbxproj-merge-driver

Commits on Sep 28, 2026
- Merge project.pbxproj by union of added entries instead of by line
  
  teamleaderleo
  and
  claude
  committed
  f246291
- fix(ci): materialize rejected pbxproj conflicts
  teamleaderleo
  committed
  7a3a49e
- fix(ci): restrict pbxproj unions to source entries
  teamleaderleo
  committed
  f4cb664
- fix(ci): validate pbxproj merge structure
  teamleaderleo
  committed
  4107b53
- fix(ci): parse pbxproj merge context structurally
  teamleaderleo
  committed
  a85a73f
- fix(ci): parse pbxproj section comments structurally
  teamleaderleo
  committed
  ee1c1b2
- fix(ci): harden installed merge drivers
  teamleaderleo
  committed
  69afe07
- Merge remote-tracking branch 'upstream/main' into codex/pr15419-cleanup-20260928
  teamleaderleo
  committed
  01d0bb2
- fix(ci): pin the merge driver interpreter
  teamleaderleo
  committed
  2f7ee6b
- Merge remote-tracking branch 'mf/main' into repair/pr15419-merge-fallback
  teamleaderleo
  committed
  9318e2b
- fix(ci): canonicalize merge driver trust roots
  teamleaderleo
  committed
  6affa33
- Merge remote-tracking branch 'mf/main' into repair/pr15419-merge-fallback
  teamleaderleo
  committed
  921af1d
- fix pbxproj merge driver conflict fallback
  teamleaderleo
  committed
  55a63f4
- fix(ci): isolate and version merge drivers
  teamleaderleo
  committed
  4bf1abc
- ci: register pbxproj merge regression test
  teamleaderleo
  committed
  88f9726
- fix(ci): migrate legacy merge driver configs
  teamleaderleo
  committed
  0c44787
- Merge remote-tracking branch 'mf/main' into repair/pr15419-merge-fallback
  teamleaderleo
  committed
  df9627b
- fix(ci): harden merge driver migration
  teamleaderleo
  committed
  84dd1d3
- fix(ci): install immutable merge migration hooks
  teamleaderleo
  committed
  3bb8182
- fix(ci): verify merge installer inputs
  teamleaderleo
  committed
  fe334fa
- test(ci): update trusted hook fixture
  teamleaderleo
  committed
  1c28dfc
- fix: keep project merge hooks trusted and precise
  teamleaderleo
  committed
  3536fb4
- fix: verify every installed hook input
  teamleaderleo
  committed
  43d0b6f
- Merge remote-tracking branch 'mf/main' into repair/pr15419-merge-fallback
  teamleaderleo
  committed
  6736cf7
- Merge remote-tracking branch 'origin/feat/pbxproj-merge-driver' into repair/pr15419-merge-fallback
  teamleaderleo
  committed
  d15ca7d
- fix: always materialize complete merge conflicts
  teamleaderleo
  committed
  7164046
- Merge remote-tracking branch 'mf/main' into repair/pr15419-merge-fallback
  teamleaderleo
  committed
  8f8715e

Commits

Commits on Sep 28, 2026