Skip to content

Conversation

@cristiand391
Copy link
Member

@cristiand391 cristiand391 commented Dec 19, 2025

DEPENDS ON: forcedotcom/source-tracking#828

What does this PR do?

Update the deploy/retrieve tools to support ignoring conflicts, this PR targets:
#321

Also added E2E tests that ensure the tools:

  • detect conflicts with ignoreConflicts=false|undefined
  • bypass and deploy/retrieve conflicts with ignoreConflicts=true(all in the same process)

others:

  • bump mcp-provider-api to latest in provider pkgs so that they all refer to the local version in the monorepo (needed to deduplicate sfdx-core)
  • bump sfdx-core/SDR/STL

What issues does this PR fix or reference?

@W-20002028@

@cristiand391 cristiand391 requested a review from a team as a code owner December 19, 2025 15:15
@cristiand391 cristiand391 requested review from a team as code owners January 22, 2026 19:55
@cristiand391 cristiand391 changed the title chore: update nut chore: fix tracking + improve NUTs W-20002028 Jan 22, 2026
});

// Force refresh of the global ShadowRepo singleton cache to detect new changes
await stl.reReadLocalTrackingCache();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

STL caches the git info per project (shadowrepo singleton) so we need to force a reRead here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants