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

Re: [TSVN] Re: TortoiseMerge: Editing conflicts

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-09-26 10:57:24 CEST

Mark Phippard wrote:

>> It's not part of the "diff". To make an effective merge, you need 3
>>distinct views: Base, Theirs, Yours. The actual merged result can be
>>done in a 4th pane, but it's more intuitive to do it over Yours since
>>that's the copy to be committed.
> I haven't had to use it enough to know what I think. Generally, I like
> it, although I think some of the recent requests seem real valid. I do
> not see the value of showing the Base version as it's own pane in the UI
> since each of the two modifications show as their diff against Base, and
> then how they relate to each other. Tmerge is a 3-way merge. I do not
> see how showing Base adds anything not already present?

And don't forget: if you don't have a 25" monitor with a resolution of
3000x3000 pixels you won't see much of the file contents you want to
merge if you have four (4) panes open!

> I do not think anyone is going to take offense at the sincere desire to
> make this a better product. The only thing I find offensive is your use
> of "Windoze". I would rather use OS X all the time, but I can't. Grow up
> and save that crap for your Linux lists.


> Finally, as others have pointed out, it is possible to plug in another
> merge tool. I do not know if it is possible to plug in Araxis Merge, but

It is. Some people do that already.

> historically that seems to be one of the better Windows merge tools. I
> have never used it, and I do not think there is a free version of it. I

Only a demo version which works for a month or so before you have to buy it.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Sep 26 12:00:43 2004

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.