[Top][All Lists]

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

Re: Bi-directional merge

From: Larry Jones
Subject: Re: Bi-directional merge
Date: Sat, 18 Nov 2006 11:19:12 -0500 (EST)

address@hidden writes:
> A merge in B removed some code in one file (myfile.txt), the file was
> corrected and committed in B, on merge into the trunk I don't get the
> changes but I get a message that myfile.txt already contains the
> differences between 1.2 and

Since 1.2 and are identical, there aren't any changes to merge.
That's all the message is trying to tell you -- there's no reason to
create a new revision on the trunk since it would be idential to the
revision that's already there.

-Larry Jones

What's the matter?  Don't you trust your own kid?! -- Calvin

reply via email to

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