Skip to content
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

Sm/conflicts-for-labels #244

Closed
wants to merge 2 commits into from

Conversation

mshanemc
Copy link
Contributor

@mshanemc mshanemc commented Oct 7, 2021

What does this PR do?

WI-related

  • show both remote and local files for conflicts
  • detect conflicts by comparing filenames, not types (helpful for CustomLabels where types don't align)
  • fix filepath => filePath on command output
  • bump SDR for new getChanges with filenames option

other

  • don't use nyc for subsets of NUTs
  • NUTs work around possible inclusion of Audience metadata type

What issues does this PR fix or reference?

@W-7590126@

Source Status
STATE                      FULL NAME     TYPE          PROJECT PATH
─────────────────────────  ────────────  ────────────  ──────────────────────────────────────────────────────────
local Changed (Conflict)   CustomLabels  CustomLabels  force-app/main/default/labels/CustomLabels.labels-meta.xml
remote Changed (Conflict)  Test          CustomLabel   force-app/main/default/labels/CustomLabels.labels-meta.xml

@mshanemc mshanemc requested review from shetzel and WillieRuemmele and removed request for shetzel October 11, 2021 23:05
Copy link
Contributor

@WillieRuemmele WillieRuemmele left a comment

Choose a reason for hiding this comment

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

There's a type issue with STL which is probably fixed in an un-published branch

@mshanemc mshanemc closed this Oct 20, 2021
@mshanemc mshanemc mentioned this pull request Oct 20, 2021
@mshanemc mshanemc deleted the sm/conflicts-for-labels branch October 25, 2021 15:27
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