FOSFacebookBundle Adding changes to master and 2.0 branch

[alterphp]

Hello,

I've forked the FOSFacebookBundle and had an helper and some
configuration to manage Facebook Registration form. I commited my
changes to my fork.

But i want to use it with a Symfony 2.0.x version so I need the 2.0
branch in my vendors. My changes only appears in the master branch, I
don't know what I should do to make them available in both master and
2.0 branches.

I know this question deals more with github issues but i thought you
could better help me on this.

[Lukas Kahwe Smith]

indeed this is a got question

you can use "git cherry-pick [sha1]" where [sha1] is a list of the sha1's of your commits.

regards,
Lukas Kahwe Smith
sm...@pooteeweet.org

[alterphp]

It sounds good. But it asked me to merge first... and I don't want to
merge origin/2.0 to master...

What I typed (I firstly tried with only 1 commit, but same result) :

git cherry-pick d31e0f3456a7ba4af649609950cfa9039738973e
c98c559e130d1acf6b90794383cebd2f2b026b81
29e3653b9213660b03de4862f303d2c5df401062
697223947e380f40760ffe6af7870e50c104302f
54c9f706942c1b521358bd30a7f07f5ffb78e76b
90c6372393cfb324be27eaf099033a0b039f67f6
63627316bbd3a2728a0014f373f113651b4bff61
0f196d229dc2c844b1fb7cd53b564eeb324c5028
3e3c7b2bb6efe1ff515db51a84b80c036f644e46

What i got :

fatal: 'cherry-pick' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as
appropriate to mark resolution and make a commit, or use 'git commit -
a'.

[alterphp]

If i resolve conflicts, continue cherry-pick until i apply all
commits, it doesn't change anything, it tells me everything is up-to-
date...

[alterphp]

All examples about cherry-pick show how to apply a commit from a
specific branch to master branch, is it possible from master to a
specific one ?

[Christophe COEVOET]

Le 26/03/2012 00:02, alterphp a �crit :

> All examples about cherry-pick show how to apply a commit from a
> specific branch to master branch, is it possible from master to a
> specific one ?

cherry-pick applies commits to the current branch. So if you want to
apply commits to the 2.0 branch, do the work in the 2.0 branch instead
of master.

--
Christophe | Stof

[alterphp]

I think I already tried this :

in my repo, i typed : git checkout origin/2.0

Then : git cherry-pick d31e0f3456a7ba4af649609950cfa9039738973e ...

After applying all commits, git tells me that everything is up-to-
date. I must miss something with the way to commit or push to a
specifi branch...

[alterphp]

I was mistaking my pushes.

The working way :

git push g...@github.com:alterphp/FOSFacebookBundle.git HEAD:2.0

Thanks for the help !