working on branch and trunk

[Adam Di Carlo]

Eric Van Buggenhaut <[EMAIL PROTECTED]> writes:
> What do you mean 'French merge rolled back' ?

I could not merge changes in 2.2.23 and 2.2.24 from potato onto the
woody version.  They conflicted.

> I just began to work on potato branch. As the use of branches,
> trunks, scissors, etc. is new to me, I might have messed up
> things. Just let me know.

I dunno.  In general, if you are fixing something for Potato, it's
best not to fix it again in woody, since the branch merge would roll
those changes in.

> Apparently, I got files correctly marked as belonging to potato
> branch but they aren't tagged. Is it right ?

Um, no, I didn't say that.

> Also, what mark of fertilizer do you usually use ?

Eh?  I don't have any garden... :)

-- 
.....Adam Di [EMAIL PROTECTED]<URL:http://www.onshored.com/>


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]