• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
Re: File Merge
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: File Merge


  • Subject: Re: File Merge
  • From: Matt Gillette <email@hidden>
  • Date: Tue, 6 Apr 2010 11:25:16 -0700

Although you can't type in left or right files, you can type in the merge file (which is usually the right).

Drag the dot up from the bottom, and you get the editable merged file.

Matt

On Apr 6, 2010, at 8:24 AM, Sean McBride wrote:

> On Tue, 6 Apr 2010 17:14:45 +0200, Jean-Daniel Dupas said:
>
>>>> I find FileMerge app a real handy tool, beats diff tool anytime. It
>>>> would be nice, if there is a swap (button) feature to swap with left &
>>>> right files.
>>>>
>>>> How do I suggest this to Xcode team ?
>>>
>>> Don't bother*.  FileMerge has not been updated in years.  It still can't
>>> even diff files with different line endings.
>>>
>>
>> Wrong, it has been updated one or two year ago to uses the same diff
>> view than Xcode and can ignore white space if you ask it to do so (in
>> preferences).
>>
>>> There are great 3rd party alternatives: Araxis Merge, TextWrangler,
>>> BBEdit, TextMate, etc.
>>>
>>> * Do file bugs in general, but don't bother for FileMerge.
>>
>>
>> That's probably thanks to the reports filled against the FileMerge tool
>> that we have a decent tool now, so do bother to fill a request.
>
> Well, to each his own.  I've filed several bugs against FileMerge and
> none have ever been fixed.  If you spend lots of time diffing, FileMerge
> is a weak tool compared to its competition.  You can't even type in the
> left and right sides!
>
> --
> ____________________________________________________________
> Sean McBride, B. Eng                 email@hidden
> Rogue Research                        www.rogue-research.com
> Mac Software Developer              Montréal, Québec, Canada
>
>
> _______________________________________________
> 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

 _______________________________________________
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

References: 
 >File Merge (From: Peter C <email@hidden>)
 >Re: File Merge (From: "Sean McBride" <email@hidden>)
 >Re: File Merge (From: Jean-Daniel Dupas <email@hidden>)
 >Re: File Merge (From: "Sean McBride" <email@hidden>)

  • Prev by Date: Re: File Merge
  • Next by Date: conditional settings based on architecture -- broken?
  • Previous by thread: Re: File Merge
  • Next by thread: Re: File Merge
  • Index(es):
    • Date
    • Thread