From: Raman Gupta <rocketraman@fastmail.fm>
Date: Thu, 12 Nov 2009 20:30:33 GMT
Subject: Re: [PATCHv3] Add branch management for releases to gitworkflows
Message-ID: <4AFC7069.1020701@fastmail.fm>
In-Reply-To: <2729632a0911121208r1f51cf9ewb0bc23e757275f30@mail.gmail.com>

skillzero@gmail.com wrote:
>> +.Update maint to new release
>> +[caption="Recipe: "]
>> +=====================================
>> +* `git branch -f next master`
>> +* `git merge ai/topic_in_next1`
>> +* `git merge ai/topic_in_next2`
> 
> Shouldn't that be something like "Update next to new release" instead
> of "maint"?

Oops. I changed the caption to "Rewind and rebuild next".

> Should it also have 'git checkout next' after the branch command so
> it's on next before merging?

Right, fixed also.

Thanks,
Raman