feat(metadata): conflicts view in metadata extension W-20189832#7009
Draft
feat(metadata): conflicts view in metadata extension W-20189832#7009
Conversation
… sm/trigger-templates
… sm/trigger-templates
… sm/trigger-templates
… sm/trigger-templates
… sm/trigger-templates
… sm/trigger-templates
… sm/trigger-templates
…nflicts-view-in-metadata
Made-with: Cursor
…nflicts-view-in-metadata
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What does this PR do?
Moves conflict detection/view from vscode-core into salesforcedx-vscode-metadata.
Make metadata ex the only way to access/run these commands, remove and cleanup from vscode-core extension.
Manually tested
org with tracking
✅ can deploy a file (via right click) when another file has a conflict -- conflict errors are scoped to the deploy componentSet
✔️ can retrieve (via right click) when another file has a conflict -- conflict errors are scoped to the deploy componentSet
What issues does this PR fix or reference?
@W-20189832@
Made with Cursor