[DUG] Source Control - Sharing files between projects

[Myles Penlington]

Araxis rules for 2 & 3 way merge/diffs.
Myles.

-----Original Message-----
From: delphi-bounces at delphi.org.nz [mailto:delphi-bounces at delphi.org.nz]
On Behalf Of Stacey Verner
Sent: Friday, 12 October 2007 08:21
To: NZ Borland Developers Group - Delphi List
Subject: RE: [DUG] Source Control - Sharing files between projects

We use Araxis Merge for two way diff's and Tortoise Merge for 3 way
merges.
We found that Tortoise Merge automatically handles the merges much
better than Araxis Merge, but Tortoise Merge is annoying when editing
conflicts. You can't edit the text. You can only pick which lines you
want to keep.

Stacey

-----Original Message-----
From: delphi-bounces at delphi.org.nz [mailto:delphi-bounces at delphi.org.nz]
On Behalf Of Stefan Mueller
Sent: Thursday, 11 October 2007 19:40
To: 'NZ Borland Developers Group - Delphi List'
Subject: RE: [DUG] Source Control - Sharing files between projects

Never liked the clunky BeyondCompare - Araxis Merge is pricy but wins
hands
down.

Here is one of my own take on making a diff-compare tool. Never really
finished it into a full commercial standalone product, hesitant seeing
that
there are already heaps of free or cheap diff-tools out on the market:

http://www.stefansblog.com/diffman/diffman.zip


So how many of you guys are actually using any form of Diff-utility for
your
work? What are your favorite compare tools (Araxis, BeyondCompare,
CompareIt,etc)?



Regards,
Stefan 




-----Original Message-----
From: delphi-bounces at delphi.org.nz [mailto:delphi-bounces at delphi.org.nz]
On
Behalf Of Jeremy North
Sent: Thursday, October 11, 2007 1:15 PM
To: NZ Borland Developers Group - Delphi List
Subject: Re: [DUG] Source Control - Sharing files between projects

I've blogged about it before but I really like BeyondCompare. The
upcoming version 3 sounds very promising on the merge front and 3 way
compares.

I expect both have trials.

cheers,
Jeremy
_______________________________________________
NZ Borland Developers Group - Delphi mailing list
Post: delphi at delphi.org.nz
Admin: http://delphi.org.nz/mailman/listinfo/delphi
Unsubscribe: send an email to delphi-request at delphi.org.nz with Subject:
unsubscribe


_______________________________________________
NZ Borland Developers Group - Delphi mailing list
Post: delphi at delphi.org.nz
Admin: http://delphi.org.nz/mailman/listinfo/delphi
Unsubscribe: send an email to delphi-request at delphi.org.nz with Subject:
unsubscribe

_______________________________________________
NZ Borland Developers Group - Delphi mailing list
Post: delphi at delphi.org.nz
Admin: http://delphi.org.nz/mailman/listinfo/delphi
Unsubscribe: send an email to delphi-request at delphi.org.nz with Subject:
unsubscribe

Attention:
This communication is confidential and may be legally privileged.  If you are not the intended recipient, please do not use, disclose, copy or distribute it, other than to return it to us with your confirmation that it has been deleted from your system.