[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: branches and merging

From: Arno Schuring
Subject: Re: branches and merging
Date: Wed, 11 May 2005 21:29:57 +0200

Venkatesh, Vijay <address@hidden> writes:

I guess this is a fairly often asked question
but just wanted to run this by everyone to get
some feedback first. (am referring to the
essential cvs guidebook)

Have two branches app4 and app4_test, which I
need to merge (and have done so already into the
app4 branch, so merged from app4_test into app4)

question1 :

should i now tag app4 to signify the point at
which the merge was made?

It would be prudent to do this if you ever wish to
do subsequent merges of the app4_test into the app4
branch in the future. However, if app4_test is to be
left dorment, then the tag is not really useful.

I haven't done much merging myself lately, but I always believed a branch-to-branch merge needed two states (tags) of the source branch, and the current state of the target branch. Or is both possible?

My question more clearly: why tag the target branch instead of the source branch? Does it really matter which one you choose?


np: Genesis - Hairless Heart

reply via email to

[Prev in Thread] Current Thread [Next in Thread]