Re: [Flightgear-devel] Howto modify release branch?

[Christian S. <ch...@il...>]

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 without manual merging. So either first 
cherry-pick the first commit and then the second one, or, if this would 
bring in too much changes, merge the second commit manually (by resolving 
the conflict git tells you about).

Chris