[Top][All Lists]

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

Re: Bi-directional merge

From: calin . hanchevici
Subject: Re: Bi-directional merge
Date: 18 Nov 2006 08:49:47 -0800
User-agent: G2/1.0

Larry Jones wrote:

> 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

Thank you Larry,
how can avoid these kind of problems? is identical with 1.2,
but is not identical with 1.3.

Does this mean that I have to correct the problem in revision 1.3,
commit the changes then merge r1.4 into my branch?

Is there a way to avoid this?


reply via email to

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