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

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

Frederick:
I am not a git-expert myself, but you could either trust Brett who uses
git in his day-job (at least what I understood) or check some sources on 
the Internet:

Especially this q&a on stackoverflow:
http://stackoverflow.com/questions/457927/git-workflow-and-rebase-vs-merge-questions

Shows the workflow using rebase in the first listing (and yours in the 
second).

You still merge your features, however you FIRST rebase your new feature 
on top of the master repo.

Maybe Brett can shed even more light on this issues (again).

Stefan


On 02/01/2012 02:06 PM, Frederick Weld wrote:
> Not regarding this specific issue but more as a request for alignment
> regarding hotfix procedure:
>
> I'm not a GIT expert but this is what I would do to provide a hotfix
> for a release branch (1.6.x - locally available remote tracking branch
> assumed):
>
> git checkout -b Hotfix-xyz 1.6.x
> ...do changes...
> git commit -a -m "Hotfix-xyz..."
> git checkout 1.6.x
> git pull
> git merge --no-ff Hotfix-xyz
> git push
> git checkout master
> git pull
> git merge --no-ff Hotfix-xyz
> git push
> git branch -D Hotfix-xyz
>
> To me, switching to auto-rebase is very dangerous if we are working on
> several remote tracking branches and might pull from one of these
> local branches to the other. If not (or if there is only one remote
> tracking branch as for Erik), switching to auto-rebase appears to be
> ok.
>
> --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