On 3/30/07, Patrick Gundlach textmate@contextgarden.net wrote:
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
Well, not sure what happened, but I removed the extra file and did clean out some >>> and <<< stuff in the main file and it doesn't give the error about the theme file anymore.
But I'm still seeing this:
2007-03-31 07:36:44.352 TextMate[3219] loadPlugIn: Dialog plug-in with same bundle identifier (com.macromates.dialog_plug-in) already loaded
Something to worry about?