[DUG] Source Control - Sharing files between projects

[Paul Heinz]

David asked: 

> Hi Paul,
> 
> Sorry to resurrect an oldish thread but...
> 
> I've been told by a couple of the guys here who were 
> reviewing the Perforce Trial that the merge/resolve tool 
> which comes with Perforce is "crap". They then qualified it 
> by saying that if you were used to text only unix compare 
> programs then you might like it. As we are used to nice 
> graphical three panel compare/merge programs (ie version1 
> left, version2 right, merged bottom) this isn't really us.

Yeah - it's serviceable (maybe) but not great. I don't use it.

> What merge/resolve tool do you (and others) use for Perforce? 
> The built in Perforce text only tool or a 3rd party tool? Or 
> have we missed something (keeping in mind that I haven't 
> actually seen what they are talking about myself yet!)

Araxis Merge is fan-friggin-tastic. And it's has special helper exes
designed to plug into Perforce.
There are probably others tools that are OK too, and admittedly, Araxis
isn't cheap but it's worth it.

Mostly I like Araxis as it has this neat 'do all the easy merge chunks'
button and then it will let me step back and fortyh through the
remaining conflicts (which are usually only a few chunks) and resolve
them manually with a few keystrokes..

Anything to make merging easier is worth having IMO. 

TTFN,
  Paul.