Something along these lines:
$ git branch my-2.10.0 origin/release/2.10.0
$ git checkout my-2.10.0
Find the commit ids of the bug fix commits on the master branch
$ git log master
Cherry pick these to your local release branch
$ git cherry-pick id
Okay, as usualy this is not so
On 7 Feb 2013, at 10:08, Renk Thorsten thorsten.i.r...@jyu.fi wrote:
I think I understand the problem, because there's a second bugfix having to
do with water later on the master branch, so presumably if I would have
pushed the changes to both branches right away it wouldn't have made any
On Thu, 7 Feb 2013, Renk Thorsten wrote:
Okay, as usualy this is not so simple... I get
git cherry-pick dd678c2f8c5613fc600d88fae9faad3a516b5bc0
error: could not apply dd678c2... Bugfix for lower quality water shader in
Atmospheric Light Scattering
hint: after resolving the conflicts,
Renk Thorsten wrote:
Sorry, I don't want to mess up the release branch, and I would much
appreciate a helping hand here.
Would you just tell us what commits from master you want in the release
branch? Of course, yes, if the commit you cherry-picked is based on
another one, that won't work
If you want all of them you should be able to cherry-pick the commits _in
order_ or, alternatively, you could just checkout the final state of the
files from master as you suggested above.
I can't cherry-pick them no matter what order I try. Basically I want
commit
On 7 Feb 2013, at 10:35, Renk Thorsten thorsten.i.r...@jyu.fi wrote:
I would much appreciate if you could take care of the issue, and also of
Done.
James
--
Free Next-Gen Firewall Hardware Offer
Buy your Sophos
Could anyone perhaps instruct me how to push onto the release branch? I have
committed a couple of shader bugfixes to the master branch which should go to
release as well, but I don't have a local release branch by default, so I'm
unsure what to do. Or is the idea that only a subset of
On Wed, 6 Feb 2013, Renk Thorsten wrote:
Could anyone perhaps instruct me how to push onto the release branch? I have
committed a couple of shader bugfixes to the master branch which should go to
release as well, but I don't have a local release branch by default, so I'm
unsure what to
8 matches
Mail list logo
