Re: multiple .mode1 files
Re: multiple .mode1 files
- Subject: Re: multiple .mode1 files
- From: Frederick Cheung <email@hidden>
- Date: Mon, 26 Dec 2005 19:11:45 +0000
On 26 Dec 2005, at 17:58, Todd Freese wrote:
I just realized that I am using subversion with xCode with two macs
with the very same name. A quick peek into the xCode project bundle
shows multiple .mode files. Current I have: todd.mode1,
todd.mode1.r33, and todd.mode1.r36.
What is with the .r33 and .r36 files? They seems to be user GUI prefs.
Can I delete these to tidy up?
That indicates the files are conflicted (subversion couldn work out
how to merge the local copy of the file with the version on the
server). To help you out, subversion will give you your version of
the file, the file as it was in the repository when you checked out,
the current version from the repository (those are the 2 .rxx files)
and a version with conflict markers in.
These are indeed just gui prefs and you can safely delete them
(personally I don't have those files checked in)
Fred
_______________________________________________
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