AFAIK the old Mac OS used CR as line-ending which sadly is incompatible
with most version control systems. I had to experience this myself when
I tried to put some ActionScript files in a GIT repository (they have
been edited using the Flash Professional IDE which saves with CR
line-endings on mac).
Apparently Netbeans also uses CR line-endings on mac, which is probably
causing these issues.
Eclipse is probably closest to what you had with Netbeans. There's also
aptana (http://aptana.com/) which is an eclipse based IDE for
Cheers - Roman
On 9/21/12 1:38 PM, Martimiz wrote:
> Hi all
> Recently I switched to using a Mac and switched to Netbeans from my
> old Windows editor, but unfortunately it ruins my pull requests,
> because it changes the line-endings for some lines that I didn't
> edit. This mostly seems to affect those lines starting with /**
> I've searched the web, but can't find a way for Netbeans to leave my
> line-endings alone. I read it checks the first line ending in the
> file, and then converts every other line ending to that format.
> Probably some files in SilverStripe have mixed line endings?
> Are there any Mac users around who'd know if and how this can be
> fixed? If not, can you please recommend another good PHP editor that
> won't do this, short of editing everything in vi?
> Thanks, Martine
> You received this message because you are subscribed to the Google
> Groups "SilverStripe Core Development" group.
> To view this discussion on the web visit
> To post to this group, send email to silverst...@googlegroups.com.
> To unsubscribe from this group, send email to
> For more options, visit this group at