[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: Mark Phippard <MarkP_at_softlanding.com>
Date: 2004-09-24 21:47:04 CEST

Nick_Gianakas@sybari.com wrote on 09/24/2004 03:50:04 PM:

> > Have you actually used TMerge before?
> Admittedly briefly. Once I discovered how much it lacked, I stopped
using
> it.
>
> > The two modified files show all of
> > their differences from their base.
> My mistake. I see it shows an inline diff w/ the base. I guess once
you
> use a 3-paned GUI, it's awkward to use inline diff and 2-pane diff at
the
> same time. With TMerge, you have to determine each file's change
(Theirs
> or Yours) from the base via inline diff, then you have to carry it over
to
> the other side and repeat teh process. It's simpler in a 3-way
> side-by-side pane because you can see how the same change from Base was
> made in Head vs Yours. Kind of like following the color across the
> screen. Along the same thought process, I think Meld's finer diff
> granularity goes a long way here--you don't have to manually scan each
(of
> 4) lines to find a change.

Except, scrolling the screen scrolls all the views making it just as easy
to see the same info. Also, since the purpose of TMerge is to resolve
conflicts, you typically really need to just concern yourself with the
conflicts. The part of the merge that does not conflict is handled
automatically. The info is just there for your benefit.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 25 15:31:36 2004

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