RE: [TSVN] Resolving Conflicts

From: SteveKing Sent: 24 July 2004 08:53
> Will Gayther wrote:
> > I'm not using TortoiseMerge because
> > 1. it won't let me actually edit the "resolved" file.
> > I have to choose which line I want to use. But often I
> > don't want either line anymore. With the other files
> > changes, sometimes I want to type in a new line myself
> > or merge info from both lines.
>
> Maybe TortoiseMerge will be able to do that someday...

I use a mixture of TortoiseMerge, Winmerge and kdiff3 :-(
None of them does what I want, so I was going to have a go at porting
features from two of them into the third, depending upon what's easiest,
_if_ I ever have any time.

kdiff3 is the ugliest (IMHO) but it has the nice feature of highlighting the
changes within a changed line. e.g. if a few characters have been changed
(like a var rename) the line will be highlighted but so will the change
within the line, which I find very handy.
I prefer the look of winmerge, and often use the directory comparison
feature, again this, for me, the presentation is better then kdiff3.
TorotiseMerge presents better then kdiff3, and I particularly like the two
lines being shown at the bottom for direct comparison.

For me TortoiseMerge and kdiff3 are good for examining differences, I find
WinMerge best for actually working on the files (if there are only two), as
Will said it's particularly good for letting you choose which file you want
to pull a diff from on a diff by diff basis, and you can edit the file a
little at the same time.
NB TortoiseMerge is obviously much more intended as a scm tool, the others
are more general diff tools, so that difference in emphasis is worth bearing
in mind.

Now if I could combine all these behaviours, I'd have a great diff tool, as
opposed to three very good ones.

Bill

--
This e-mail transmission is strictly confidential and intended solely
for the person or organisation to whom it is addressed. It may contain
privileged and confidential information and if you are not the intended
recipient, you must not copy, distribute or take any action in reliance
on it. If you have received this email in error, please reply to the
sender as soon as possible and delete the message. Please note that we
are able to, and reserve the right to, monitor e-mail communications
passing through our network.
The views expressed in this email are not that of the company unless
specified within the message.
The inclusion of this footnote indicates that the mail message and any
attachments have been checked for the presence of known viruses.
If you have any comments regarding our policy please direct them to
postmaster@cox.co.uk
________________________________________________________________________
This email has been scanned for all viruses by the MessageLabs Email
Security System. For more information on a proactive email security
service working around the clock, around the globe, visit
http://www.messagelabs.com
________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org