fix(ci): stop immediately when workspace.jsonc conflicts detected during merge #10081
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
…ing merge During 'bit ci merge', if the checkout step encounters workspace.jsonc conflicts due to conflicting dependency versions, the process now stops immediately with a clear error message instead of continuing with tagging and export operations. This prevents the CI from proceeding with invalid dependency state and instructs users to manually run 'bit checkout head' to resolve the conflicts. Fixes the issue where CI would continue after printing workspace.jsonc conflict warnings, leading to potential build failures or inconsistent dependency states.
GiladShoham
approved these changes
Nov 19, 2025
davidfirst
deleted the
fix/ci-merge-stop-on-workspace-jsonc-conflicts
branch
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.
Summary
Fixes an issue where
bit ci mergecontinued executing despite encountering workspace.jsonc conflicts during the checkout step, potentially leading to build failures and inconsistent dependency states.Changes
bit checkout headinbit ci mergebit checkout headmanuallyBehavior
Before:
bit ci mergewould print workspace.jsonc conflict warnings but continueAfter:
bit ci mergedetects workspace.jsonc conflicts after checkoutbit checkout headRelated
Example from CircleCI where this issue occurred:
https://app.circleci.com/pipelines/github/teambit/bit/44621/workflows/9461c6c8-ac58-4c34-8abe-9fe0d99fd0ba/jobs/392816
Test Plan
e2e/harmony/ci-commands.e2e.ts