Re: Why doesn't FileMerge work?
Re: Why doesn't FileMerge work?
- Subject: Re: Why doesn't FileMerge work?
- From: "Clark Cox" <email@hidden>
- Date: Thu, 20 Mar 2008 09:38:57 -0700
On Thu, Mar 20, 2008 at 9:18 AM, Paul Sargent <email@hidden> wrote:
>
> On 19 Mar 2008, at 23:08, Chris Espinosa wrote:
>
> > You might want to check out the integrated SCM file merge in Xcode
> > proper, which a) is growing to address all the cases covered by
> > FileMerge (but hasn't yet) and b) does this properly.
> >
> > We're not investing in fixing the creaky old FileMerge because we've
> > been diligently replacing it with an integrated function that works
> > right.
>
> Is this SCM file merge available when your not using SCM (or rather
> using a SCM system that xcode doesn't support)?
>
> I wasn't aware this existed, and I can't see how to invoke it.
It's not yet possible to invoke it outside of an SCM context (which is
one reason that FileMerge still exists)
>
> I'm sorry to hear filemerge is disappearing as it's infinitely better
> than most of the GUI merge programs I've seen, warts and all.
Personally, I use BBEdit's bbdiff command. If you don't want to pay
for BBEdit, you can get essentially identical diff functionality from
TextWrangler's twdiff command. I highly recommend both.
Additionally, Changes looks quite promising (I haven't had much time
to try it out, but my office mate recommends it). It has a very clean
and usable interface, and I have a feeling that once I get a chance to
really put it through its paces, it may replace bbdiff for me.
Hopefully, in the future we can provide something even better in Xcode. :)
--
Clark S. Cox III
email@hidden
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden