Suggestions for procedure going forward

[Robert Goldman]

On 11/18/15 Nov 18 -11:33 PM, Steven Núñez wrote:
> With git you can, and usually do, have many branches, including personal ones. The pull request will be against a specific branch. I only read this message of the thread, so hope I'm answering the right question. Github has some good tutorials.

Well the question isn't really about having many branches.  The question
is what happens when you have stable and development branches, and you
want to "jump" the stable branch to mark retiring an old stable version
and starting a new one?  Doesn't that involve a nasty merge or rebase?

I can do some research, but I was hoping someone knew the answer....
> 
> -----Original Message-----
> From: asdf-devel [mailto:asdf-devel-bounces at common-lisp.net] On Behalf Of Robert Goldman
> Sent: 18 November, 2015 21:17
> To: asdf-devel at common-lisp.net
> Subject: Re: Suggestions for procedure going forward
> 
> On 11/18/15 Nov 18 -8:35 PM, Faré wrote:
>> Yeah, there's an awkward merge or rebase happening when "stable" jumps 
>> from 3.1 to 3.2, whereas no such jump happens if old branches have 
>> numbered names and are forked off a master that keeps going forward.
>>
> 
> Surely git must have a solution to this problem?  There must be a ton of projects that need to have a "stable" and a "development" branch.  So this must arise all over the place....
> 
> Anyone know?
>