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

fix for Issue #101 - Unable to open SquishItAspNetTest in VS2010 #102

Closed
wants to merge 4 commits into
base: master
from

Conversation

Projects
None yet
3 participants
@alanning

alanning commented Nov 17, 2011

Simple fix, just removed reference to VS9 file in project's csproj file

@alanning

This comment has been minimized.

Owner

alanning commented on 288ba40 Nov 17, 2011

all unit tests pass; mono tests not run

@alanning

This comment has been minimized.

alanning commented Nov 17, 2011

Hmm. I didn't realize pushing further commits to my fork would affect this pull request. Is there any way to split this pull request into two separate requests?

The SquishAndGetUrls method is for use when loading files on-demand (ie. jQuery.ajax, dojo.require, YUI.Get.script, etc).

Renders the bundle and returns the url(s) as appropriate.

Eg.

Bundle()
  .Javascript()
  .Add("~/js/test1.js")
  .Add("~/js/test2.js")
  .SquishAndGetUrls("~/js/test_#.js")

If Debug, returns ["/js/test1.js","/js/test2.js"]

If Release, returns ["/js/test_43958ADEC93DAC8037D2471A95382DE9.js"]

Unit Tests included for Javascript and Css bundles.

@jetheredge

This comment has been minimized.

Owner

jetheredge commented Feb 7, 2012

Apologies, I don't think I have seen any messages at all from this pull request. I didn't realize it was here until just now. I'm looking at some of your commits, and I like them. We might change up some of the naming, but I really like it. Thank you!

@alanning

This comment has been minimized.

alanning commented Feb 7, 2012

Glad it might be useful. I wasn't sure about the etiquette of bugging
project owners regarding pull requests so I didn't pursue it.

Sorry about the messed up commit/pull thing. I don't know enough
about how github works to clean them up now that they are both in the
pull request. Can you work with them as they are now, mixed together,
or should I cancel the request and try again?

Thanks again for making a great tool.

@jetheredge

This comment has been minimized.

Owner

jetheredge commented Feb 7, 2012

I can split them up and integrate them separately, but it won't look like it came from your fork. As long as you don't care about the fame and fortune that comes with your name on a commit :-)

In the future, just create a branch in your fork and then point the pull request to that branch. It is a really useful feature that you can add changes to a pull request since it just points at a fork, but it is confusing when you first do it! I know I made the same exact mistake.

Justin Etheredge
Company: http://www.ecstaticlabs.com
Blog: http://www.codethinked.com
Twitter: @JustinEtheredge (http://twitter.com/#!/JustinEtheredge)

On Tuesday, February 7, 2012 at 9:12 AM, Adrian Lanning wrote:

Hi Justin,

Glad it might be useful. I wasn't sure about the etiquette of bugging
project owners regarding pull requests so I didn't pursue it.

Sorry about the messed up commit/pull thing. I don't know enough
about how github works to clean them up now that they are both in the
pull request. Can you work with them as they are now, mixed together,
or should I cancel the request and try again?

Thanks again for making a great tool.

Adrian

Adrian Lanning
Founder, RealProjection
203-895-8830
http://realprojection.com/

On Mon, Feb 6, 2012 at 9:58 PM, Justin Etheredge
<reply@reply.github.com (mailto:reply@reply.github.com)>
wrote:

Apologies, I don't think I have seen any messages at all from this pull request. I didn't realize it was here until just now. I'm looking at some of your commits, and I like them. We might change up some of the naming, but I really like it. Thank you!


Reply to this email directly or view it on GitHub:
#102 (comment)


Reply to this email directly or view it on GitHub:
#102 (comment)

@alanning

This comment has been minimized.

alanning commented Feb 7, 2012

Integrate away, good sir. :-)

Thanks for the advice. Regarding getting it right the next time, do you happen to have any good references to a simple workflow? I found this one from the NuGet guys (bottom of the page) but it seems a bit more complicated than what you describe: https://github.com/NuGet/NuGetGallery/blob/master/README.markdown

Assuming the NuGet workflow is appropriate, then next time should I submit the github pull request between steps 4 and 5? Or is that automatically done with the 'git pull' command in step 5?

@jetheredge

This comment has been minimized.

Owner

jetheredge commented Feb 9, 2012

I think that their workflow is a bit more complicated. I think you'll want to create branches in your fork and not merge them into master. This way you can create multiple pull requests from the same fork.

@AlexCuse AlexCuse closed this May 8, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment