Update composer.md #2932

Closed
wants to merge 1 commit into
from

3 participants

@timsnadden

No description provided.

@tractorcow

Thanks awesomely @timsnadden. Do you mind to please rebase this against 3.0 branch? We can merge this up to all newer branches that way.

I'm depening on you!

@simonwelsh

@tractorcow You're able to merge this into 3.0 yourself :) You do need to use the command line to do it though. Wanna give it a go?

Steps to do so:

git checkout -b timsnadden-patch-1 3.0
git pull git://github.com/timsnadden/sapphire.git patch-1
git checkout 3.0
git merge timsnadden-patch-1
git push origin 3.0

Or, if you don't want the merge commit:

git checkout 3.0
git pull git://github.com/timsnadden/sapphire.git patch-1
git push origin 3.0
@tractorcow

Appreciate the help as always @simonwelsh :)

@simonwelsh

No worries :) Don't forget to close this once you've pushed.

@simonwelsh simonwelsh added the 3.0 label Mar 15, 2014
@tractorcow

That didn't seem to work @simonwelsh. Trying to merge his patch (which is based on 3.1) into 3.0 resulted in thousands of changes.

The good news is that it looks like @timsnadden managed to get this merged into 3.0 in my absence, and it's already in 3.1, so we can close this.

@tractorcow tractorcow closed this Mar 17, 2014
@simonwelsh

Ah yes, forgot about that.

So, merging into a different branch is curl https://github.com/silverstripe/silverstripe-framework/pull/2932.patch | git am (either with or without a specific local branch depending on if you want a merge commit or not)

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