Merge main before starting SDLC work - #493

Merged

jwbron merged 7 commits into

mainfrom

egg/merge-main-before-work

Feb 11, 2026

Commits on Feb 10, 2026

Merge main into issue branch before starting SDLC work

egg
authored and
jwbron
committed
c06113c
Address review feedback on merge-main-before-work PR

james-in-a-box[bot]
authored and
jwbron
committed
3255803
Fix conflict resolver exit code to prevent stale code execution

james-in-a-box[bot]
authored and
jwbron
committed
1f56e9f
Wait for conflict resolver to complete instead of bailing immediately
jwbron
committed
0153ed2
Fix race condition in workflow run identification and add error handling

james-in-a-box[bot]
authored and
jwbron
committed
e0455a3
Fix indentation in sdlc-pipeline.yml conflict resolution block

james-in-a-box[bot]
authored and
jwbron
committed
07b597c
Address review feedback on autofix workflow robustness
james-in-a-box[bot]
committed
0369170