Re: Bi-directional merge

[calin . hanchevici]

Larry Jones wrote:

>
> Since 1.2 and 1.2.14.2 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? 1.2.14.2 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?

calin