Re: [Gnu-arch-users] a second branch

[Stig Brautaset]

On Tue, Oct 19, 2004 at 04:28:59PM +1000, Zenaan Harkness wrote:
> OK, I have a simple setup:
> 
>            stable
>           /      \
> developer1        developer2
...
> Now, I have a change that will take me a good week or may be three, and
> I want to develop this in a new branch, so I can make bug fixes in my
> regular branch.
...
> Should I tag off of developer1 (my dev branch) or tag another branch off
> of stable?

I'd tag off stable.

> If the former, then do I just star-merge the changes once completed into
> stable, or into my developer1 branch and then into stable?

If you tag from your branch then you should probably star-merge into
your branch before merging into stable. Or, you could use star-merge
with the --reference option.

> If none of it matters, are there any consequences to the alternatives?

Basically, pick where/how you want to resolve potential conflicts...

Stig