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

[Frederick W. <fre...@go...>]

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