fix: preserve existing CLI branch work in coverage workflow #62
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The workflow was force-pushing from main, overwriting any existing work on the cli-coverage-update branch. This change: - Checks out the existing branch if it exists before making changes - Merges main into the branch to keep it current - Instructs the agent to NOT force push, preserving branch history
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
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.
| git fetch origin cli-coverage-update | ||
| git checkout cli-coverage-update | ||
| # Merge latest main to keep it up to date | ||
| git merge origin/main -m "Merge main into cli-coverage-update" --no-edit || true |
There was a problem hiding this comment.
Silent merge failure leaves repository in conflicted state
High Severity
The git merge origin/main ... || true silently continues when merge conflicts occur. When a merge fails, the repository is left in a "merging" state with conflict markers in files. The Cursor agent then runs on this corrupted state, which could lead to commits containing conflict markers being pushed, or confusing failures. The merge failure needs explicit handling—either fail the workflow, abort the merge, or resolve conflicts.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note
Workflow behavior updates
update-cli-coverage.ymlnow checks out the existingcli-coverage-updatebranch in the CLI repo (if it exists) and mergesorigin/maininto it to keep it current.Process/instruction changes
git push origin cli-coverage-update(no force push), and rebase if needed to preserve existing work and history.Written by Cursor Bugbot for commit 223521c. This will update automatically on new commits. Configure here.