rebase develop after cherry-pick to release

[cleanrock]

I think we can avoid the reverts when merging back release onto develop:

1. cherry-pick a bunch of commits from develop to release
# git checkout release
# gitk --all (right click the commits on develop to cherry-pick to release)

2. rebase develop
# git checkout develop
# git rebase release

http://davitenio.wordpress.com/2008/09/ ... e-commits/

[jK]

tried it and it gave me an never ending horror of merge conflicts :<