Skip to content

fix: Configure git identity before merge in conflict resolution #818

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 1 commit into from
Jan 12, 2026
Merged

fix: Configure git identity before merge in conflict resolution #818

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 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 @@ -478,6 +478,10 @@ jobs:
run: |
set -euo pipefail

# Configure git identity for merge operations
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

# Determine the base branch to merge from:
# 1. Use GITHUB_BASE_REF if set (PR workflows).
# 2. Use WORKFLOW_BASE_REF from the workflow_call context if provided.
Expand Down
Loading