Re: Why doesn't FileMerge work?
Re: Why doesn't FileMerge work?
- Subject: Re: Why doesn't FileMerge work?
- From: Brad Oliver <email@hidden>
- Date: Thu, 20 Mar 2008 19:50:31 -0700
On Mar 20, 2008, at 5:58 PM, email@hidden wrote:
And I kind of like the idea of "forcing" one type of line ending (in
this
case Unix style). Yes it forces you to convert all your files to
Unix line
endings, but why would you want mixed line endings anyway? Is there
a real
use for it?
If you get code drops from another platform - e.g. Win32 - and want to
do a 3-way merge to integrate the changes into your Mac-specific
codebase, you might run into this all the time. In some cases, this
means having to create a copy of read-only source to address the line
endings issue just to complete the merge.
--
Brad Oliver
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