Yes, R2 is the version that's present in your sandbox.
--- Forwarded mail from [EMAIL PROTECTED]
Thanks Paul, but I'm not sure I've got this straight, so bear with me one more
time! :-)
Paul Sander wrote:
>
> You can think of a 3-way merge in the following way:
>
> Given a common ancestor revision A, and two contributor revisions R1 and
> R2, apply the difference between A and R1 to R2. In your case, A is 1.3,
> R1 is 1.4, and R2 is 1.5.
So, R2 will always be the latest revision either from the repository or the
sandbox - is that right? I couldn't understand how CVS knew about R2 but I
think that makes sense now.
--- End of forwarded message from [EMAIL PROTECTED]
