Great! Thanks for the info, I'll try it. Bill
On May 6, 8:24 am, jeroenh <jeroen.haegeba...@gmail.com> wrote: > This is already possible today. > > You can configure TortoiseSVN to use any external diff and/or merge > tool, as long as it can be run from a command line. > > cf.http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-settings.... > > Personally I use kdiff3, which works just fine (and is free) > > greetz, > jeroen > > On 6 mei, 14:29, BillD <bill.dickin...@preventiongenetics.com> wrote: > > > Hello, > > > Since installing VisualSVN we have found that we spend more time than > > we want to on resolving code conflicts. In our environment concurrent > > code changes (with frequent updates) are the norm. We have yet to > > fully understand how to use the TortoiseSVN conflict resolution tool, > > but hopefully we'll get there some day. In the mean time, we have > > found a slick way of resolving conflicts using a tool called Beyond > > Compare which is produced by a company named Scooter Software. > > > After updating a local copy of a project from the repository, we > > simply open up the "update" and "mine" versions of code needing > > resolution and we can see, side-by-side, the exact differences (and > > thus the necessary merge changes). We can move blocks of code from > > one file to the other with a single mouse click and hand-edit > > anything. Perhaps the VisualSVN folks might look at Beyond Compare > > and consider a partnership with Scooter Software to produce a more > > intuitive code conflict resolution tool. > > > Regards, > > > Bill Dickinson
