This repository was archived by the owner on Oct 9, 2020. It is now read-only.
Open
Conversation
`uglify` option in `build` now accepts `uglify.output` consistent with the Uglify2 API. This change does NOT change existing behaviour as the inconsistent `uglify.beautify` option is still valid. Internally `uglify.output` is copied into `uglify.beautify`, when the latter is not specified. If `uglify.beautify` is specified, then `uglify.output` is ignored.
Member
|
I guess the version upgrade from here should still go through. Would it be possible to rebase that? |
Contributor
Author
|
I am not sure what to do here! The 0.15 branch is pointing to the point of branching and not the tip of the tree ie 0.15.36 tag. On my copy of the repo CxRes/builder, the fix-uglify-option branch sits correctly on top of 0.15.36 tag but I don't get what github does when I place a PR from that branch that leads to this conflict???? |
Member
|
This is definitely a PR against the master branch not the 0.15 branch, and the code is a diff against that fine. If you're just looking to resolve the conflicts, a |
guybedford
force-pushed
the
master
branch
2 times, most recently
from
0171134 to
52ad54c
Compare
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #689! See commit message for more info.