Re: [Rails-devel] FW: Fwd: 1830 RSM Fix included

[Stefan F. <ste...@we...>]

Frederick:
My solution for this currently is to git cherry-pick the
bug-fix commit into the 1.6.x branch.

Usually bug fixes do not effect lots of file, and if there
is a conflict it is usually easy to resolve.

But the main reason for this solution is that usually I receive the 
bug-fixes as already merged into master.

Should it not be possible to first rebase on master, then revert that 
rebase and then rebase on 1.6.x.?

However I am curious if Brett has a better recommendation.

Stefan



On 02/01/2012 03:48 PM, Frederick Weld wrote:
> Brett:
> So what would be the git command sequence when wanting to create a fix
> in a separate branch which is to be merged back to both 1.6.x and
> master (You could copy-paste aforementioned order as a template)?
>
> If rebasing is done before merging into 1.6.x and master, the hotfix
> commit will be altered (and not be the same as used in 1.6.x).
> Probably no big issue as 1.6.x and master will never be merged again.
>
> --Frederick
>
> ------------------------------------------------------------------------------
> Keep Your Developer Skills Current with LearnDevNow!
> The most comprehensive online learning library for Microsoft developers
> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
> Metro Style Apps, more. Free future releases when you subscribe now!
> http://p.sf.net/sfu/learndevnow-d2d
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel