GPT-5 finding
Aggressive auto-resolve on rebase can silently discard generated changes (data loss risk)
mediumdata-losshigh
- .github/workflows/aeon.yml
On rebase conflicts, any conflicted file outside a small allowlist is force-resolved to remote ("theirs"), discarding the job’s local changes. If Claude or the workflow legitimately modified code or config files, those changes will be lost without visibility beyond a push failure or later divergence.
Recommendation
Narrow the auto-resolve to known, deterministic artifacts, and fail the job for other conflicts to avoid silent loss. Alternatively, stash the local version to a branch or artifact for review. For example, bail out unless only memory/* and .outputs/* are conflicted; or automatically create a temporary branch with both versions committed for manual triage.