Conversation
kylebuch8
approved these changes
Sep 19, 2018
Contributor
kylebuch8
left a comment
kylebuch8
left a comment
There was a problem hiding this comment.
Lourdes Garcia Transmits Messages
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.
This flags
elements/*/*.umd.jsfiles as binary, so that git diff doesn't do a text diff on them (it just says "this file changed"), and git merge just accepts the newer version without trying to do a text merge.Ideally this would be done on every generated file (ie,
rh-card.umd.jsandrh-card.jsfor example), but matching the ESM version (rh-card.js) is much harder.*.umd.jsis easy to match precisely, but*.jsoverreaches and matches the gulpfile, storybook file, and rollup config as well. So for now at least, this only applies to the UMD builds.