Fix hotfix conflict handling

[benflexcompute]

What changed

• treat a failed git cherry-pick as a real conflict only when unmerged paths are present
• stop describing conflict hotfix PRs as automatically resolved and instead mark them as requiring manual conflict resolution
• block auto-hotfix PRs that still add a full set of Git conflict markers in their diff
• keep the existing placeholder guard for manual tracking PRs

Why

The hotfix workflow was conflating any cherry-pick failure with merge conflicts and could describe conflict PRs as already resolved. That made the workflow misleading and left merge safety dependent on whatever CI happened to catch.

Impact

• non-conflict cherry-pick failures now fail loudly instead of being misclassified as conflicts
• conflict hotfix PRs remain low-friction for humans to fix in-place, but they are now clearly labeled as manual-resolution PRs
• unresolved conflict markers in auto-hotfix PR diffs are explicitly blocked from merge

Validation

• parsed both workflow YAML files successfully
• ran git diff --check
• did not run unit tests

---

Note

Medium Risk
Changes GitHub Actions logic for creating and gating hotfix PRs; mistakes could incorrectly fail runs or block/allow merges on auto-hotfix PRs.

Overview
Improves the hotfix PR automation to distinguish true cherry-pick merge conflicts from other cherry-pick failures by only treating failures with unmerged paths as conflicts (and failing loudly otherwise).

Updates conflict hotfix PR messaging to explicitly require manual conflict resolution and includes the list of conflicted files in the PR body.

Tightens the hotfix-tracking-guard workflow so it only runs checks for PRs labeled auto-hotfix, and additionally blocks those PRs if their diff adds full Git conflict markers (while keeping the existing placeholder-file guard for manual tracking PRs).

^{Written by Cursor Bugbot for commit 2adcd58. This will update automatically on new commits. Configure here.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}