Skip to content

fix: surface merge conflicts before invoking Codex #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stranske merged 4 commits into from
Jan 12, 2026
Merged

fix: surface merge conflicts before invoking Codex #812

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b90615
fix: surface merge conflicts before invoking Codex
stranske Jan 12, 2026
dd1f060
Merge branch 'main' into fix/surface-merge-conflicts-before-codex
stranske Jan 12, 2026
70ca70b
chore(codex-keepalive): apply updates (PR #812)
github-actions[bot] Jan 12, 2026
425e472
fix: address bot review feedback - move merge step and make branch de…
stranske Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/reusable-codex-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,26 @@ jobs:
path: .workflows-lib
token: ${{ steps.auth_token.outputs.checkout_token }}


# Surface merge conflicts before Codex runs
# When action='conflict', we need to attempt the merge BEFORE invoking Codex
# so that conflicts are visible in the workspace. Otherwise Codex checks
# git status, sees no conflicts (because merge hasn't been attempted yet),
# and exits early despite prompt instructions to run the merge.
- name: Surface merge conflicts
if: inputs.prompt_file == '.github/codex/prompts/fix_merge_conflicts.md'
run: |
set +e # Don't exit on merge failure - conflicts are expected
git fetch origin main
git merge --no-commit --no-ff origin/main
Comment thread
stranske marked this conversation as resolved.
Outdated
Comment thread
stranske marked this conversation as resolved.
Outdated
merge_exit=$?
if [ $merge_exit -ne 0 ]; then
echo "Merge conflicts detected (expected for conflict resolution)"
git status
else
echo "No merge conflicts - merge succeeded automatically"
fi
set -e
Comment thread
stranske marked this conversation as resolved.
Outdated
- name: Set up Python
uses: actions/setup-python@v6
with:
Expand Down
Loading