[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict cannot be resolved

From: Lübbe Onken <luebbe.tortoisesvn_at_googlemail.com>
Date: Thu, 29 Oct 2009 09:21:50 +0100

Am 28.10.2009 20:21, schrieb Robert Dailey:
> I'm doing a complex merge from revision 1797 to about 1980 or so... it's
> a lot of changes.

 From Napoleon to Ronald Reagan. A lot happened in these 183 years. You
should integrate more often :)

SCNR
- Lübbe 

--
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2412471
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-29 09:21:05 CET

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.