xcode scm failure: conflict with [username].mode1v3 package file

I get this error in realtion to my [username].mode1v3 package file:

Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed (details follow):

I can 开发者_Python百科do a compare from the SCM results menu on this file. Doing so reveals 102 conflicts (differences) between my local copy and the latest version in the repository. Problem is I don't understand what this file relates to or how to fix it. Differences occur in the file under keys like

PBXSmartGroupTreeModuleColumnWidthsKey

which I have no idea about.

I am the only one working on this project. How is it possible to resolve a conflict such as this?

Many thanks.

Sounds like you're probably working on two computers?

Any conflicts that happen in that file can safely be ignored - just tell your SCM to accept your local version. It's one of the files Xcode uses to keep track of your project state within the IDE.

I'd recommend taking it out of source control and telling your SCM system to ignore it.

This file contains your personal Xcode settings (like window positions and so on). It should not be under version control at all.