search

systemjs / builder

SystemJS build tool
MIT License
466 stars 122 forks source link

Add uglify.output option #820

Open CxRes opened 6 years ago

CxRes commented 6 years ago

Fixes #689! See commit message for more info.

guybedford commented 6 years ago

I guess the version upgrade from here should still go through. Would it be possible to rebase that?

CxRes commented 6 years ago

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????

guybedford commented 6 years ago

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 git pull --rebase origin master with possible conflict fixing may just be what is needed here?