-
Notifications
You must be signed in to change notification settings - Fork 69
chore: fix tracking + improve NUTs W-20002028 #355
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
cristiand391
wants to merge
9
commits into
sl/W-20002028
Choose a base branch
from
cd/deploy-nut
base: sl/W-20002028
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
soridalac
approved these changes
Jan 5, 2026
cristiand391
commented
Jan 22, 2026
| }); | ||
|
|
||
| // Force refresh of the global ShadowRepo singleton cache to detect new changes | ||
| await stl.reReadLocalTrackingCache(); |
Member
Author
There was a problem hiding this comment.
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
soridalac
approved these changes
Jan 23, 2026
soridalac
approved these changes
Jan 23, 2026
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.
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:
ignoreConflicts=false|undefinedignoreConflicts=true(all in the same process)others:
What issues does this PR fix or reference?
@W-20002028@