Repository navigation

fix(xcstrings): keep conflict resolutions valid JSON - #16071

Merged

teamleaderleo merged 10 commits into

manaflow-ai:mainfrom

teamleaderleo:fix/xcstrings-conflict-comma

Oct 1, 2026

Commits on Sep 30, 2026

fix(xcstrings): keep conflict resolutions valid JSON

teamleaderleo
and
claude
committed
39a7ce2
Merge remote-tracking branch 'origin/main' into fix/xcstrings-conflict-comma
teamleaderleo
committed
5f91e76
test(xcstrings): retain conflict containment assertions

teamleaderleo
and
claude
committed
06ab9f5
Merge remote-tracking branch 'origin/main' into fix/xcstrings-conflict-comma
teamleaderleo
committed
637855d
Merge remote-tracking branch 'origin/main' into fix/xcstrings-conflict-comma
teamleaderleo
committed
2820e8f
Merge remote-tracking branch 'origin/main' into fix/xcstrings-conflict-comma
teamleaderleo
committed
df1d6c2
Merge remote-tracking branch 'origin/main' into fix/xcstrings-conflict-comma
teamleaderleo
committed
87fdb30
Merge remote-tracking branch 'origin/main' into fix/xcstrings-conflict-comma

teamleaderleo
and
claude
committed
635d34a
Merge remote-tracking branch 'origin/main' into fix/xcstrings-conflict-comma
teamleaderleo
committed
52f765e
Merge remote-tracking branch 'origin/main' into fix/xcstrings-conflict-comma

teamleaderleo
and
claude
committed
f44612e