Skip to content

fix(workflows): use -X theirs to resolve sync merge conflicts#509

Merged
frankkilcommins merged 1 commit into
OAI:mainfrom
frankkilcommins:update-sync-actions
Jul 8, 2026
Merged

fix(workflows): use -X theirs to resolve sync merge conflicts#509
frankkilcommins merged 1 commit into
OAI:mainfrom
frankkilcommins:update-sync-actions

fix(workflows): use -X theirs to resolve sync merge conflicts

3f5c829
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
test
succeeded Jul 8, 2026 in 18s