[TxMt] Re: Errors launching Textmate

Patrick Gundlach textmate at contextgarden.net
Fri Mar 30 22:39:51 UTC 2007


Hi,

> Mac Classic.tmTheme
> Mac Classic.tmTheme.mine
> Mac Classic.tmTheme.r6832
> Mac Classic.tmTheme.r6784
>
> Why are there 4? 

This looks like a subversion "conflict" (local and remote changes in
the same place).

> Should I just delete them and re-update from svn?

If you are sure you didn't make any change, then yes, delete them and
re-update.

This is without knowing what is going on. I would guess that the first
file has some <<<<<< and >>>>>> lines marking conflicts (is this still
true with svn?). And this will most likely cause any application
reading this file to choke.

Patrick



More information about the textmate mailing list