CI/CD: Enhance `conflict-resolver.yml` to prevent masking non-conflict merge errors

[arii]

Original Issue Body

The git merge ... || true command in conflict-resolver.yml can potentially mask non-conflict related merge errors. The workflow should be updated to allow the merge command to fail naturally and then explicitly check for unresolved conflicts, providing clearer error reporting for different failure scenarios.

Generated by Gemini Code Review

• Source: PR #6096
• Branch: improve-workout-summary-ux-3193502323466040879
• Commit: 186f278

Problem Description

The current conflict-resolver.yml workflow utilizes the git merge ... || true command. This pattern can inadvertently mask critical merge errors that are not related to conflicts (e.g., repository corruption, permission issues, invalid merge strategies, etc.). By forcing the command to always succeed (|| true), the workflow might proceed without detecting underlying issues, potentially leading to an unstable or incorrect merge state that is hard to debug or identify during automated checks.

Proposed Solution

The workflow should be updated to remove the || true from the git merge command, allowing it to fail naturally if a non-conflict error occurs. This ensures that genuine git merge failures halt the workflow immediately, providing clear feedback.

Subsequently, the workflow should include an explicit check for the presence of unresolved conflicts (e.g., using git diff --check or git status --porcelain) after the git merge command has executed successfully. This separation will enable:

1. Clearer Failure Signals: Immediate workflow termination with a non-zero exit code if git merge encounters a non-conflict error.
2. Specific Conflict Detection: Dedicated reporting or actions when a merge completes but has conflicts, indicating that the conflict resolution mechanism needs to be engaged.

This approach will provide more precise error reporting for different failure scenarios within the merge process, improving the reliability and maintainability of our CI/CD pipelines.

---

Original Issue Content:
The git merge ... || true command in conflict-resolver.yml can potentially mask non-conflict related merge errors. The workflow should be updated to allow the merge command to fail naturally and then explicitly check for unresolved conflicts, providing clearer error reporting for different failure scenarios.

Generated by Gemini Code Review

• Source: PR #6096
• Branch: improve-workout-summary-ux-3193502323466040879
• Commit: 186f278

[arii]

🤖 Gemini Smart Triage

Summary: The conflict-resolver.yml workflow's git merge ... || true command can mask critical non-conflict related merge errors, requiring an update to improve error detection and reporting.
Priority: Medium | Score: 9/10

Analysis:
The core issue identified is the suppression of git merge command failures within the conflict-resolver.yml workflow due to the || true operator. This prevents the CI/CD pipeline from accurately detecting and reporting non-conflict related merge errors (e.g., repository corruption, permission issues). The proposed solution involves allowing git merge to fail naturally, thereby leveraging its native exit codes for non-conflict issues. A subsequent, explicit check for unresolved merge conflicts should then be implemented. This separation of concerns will provide distinct and clearer error signals, significantly improving the diagnostic capabilities and robustness of the merge process within the CI/CD pipeline.

Suggestion: Consider renaming this issue to: "CI/CD: Enhance conflict-resolver.yml to prevent masking non-conflict merge errors"