Gustav Brock
Gustav at cactus.dk
Sat Mar 13 11:25:03 CST 2010
Hi David Yes, it will bring up the two files showing the parts where they differ and let you pick and choose which parts to keep. /gustav >>> davidmcafee at gmail.com 13-03-2010 17:16 >>> If I remember correctly, you can even compare two checked in versions for differences. Gustav Brock <Gustav at cactus.dk> wrote: >Hi John > >Yes. However, if you are working on more than one machine, the situation may happen if you are a little confused. > >/gustav > > >>>> jwcolby at colbyconsulting.com 13-03-2010 16:59 >>> >Well, I don't have any red (yet). You mentioned red didn't you? > >I assume conflicts would be between checked out versions in two different machines, and so far it is just me. > >John W. Colby >www.ColbyConsulting.com