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, mark the corrected paths > hint: with 'git add <paths>' or 'git rm <paths>' > hint: and commit the result with 'git commit' > > > 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 problems, but I don't know how to resolve this properly > now. Should I simply checkout the files from master I need rather than > cherry-pick? Or edit them? Does that matter for the history in the end? > > Sorry, I don't want to mess up the release branch, and I would much > appreciate a helping hand here.
Ok, so you have multiple commits on master modifying the same file(s) since the branch was cut? If you don't want all of those changes you need to do cherry-picking and resolve the conflicts by hand. 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. To get your local release branch back in order $ git reset --hard should do (but that I think you knew already). Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://gitorious.org/anders-hangar http://www.gidenstam.org/FlightGear/ ------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
