StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POGit Help UserInterfaceState.xcuserstate: warning: Merge conflict: File still marked as conflicted
text
Body
copied!<p>I have a project I have been working on in Xcode 4.4.1, and wanted to go back to a previous Branch. (Note branches are not complex, but represent a linear development)</p> <p>When I selected the previous branch there was a warning</p> <pre><code>UserInterfaceState.xcuserstate: warning: Merge conflict: File still marked as conflicted </code></pre> <p>Everything looked OK, but all the build and run menu items are greyed out, so I can't do anything.</p> <p>I tried to to revert to the latest branch, and this looks OK, but there is still a Merge conflict MyProject.xcodeproj/project.xcworkspace/xcuserdata/ian.xcuserdatad/UserInterfaceState.xcuserstate: warning: Merge conflict: File still marked as conflicted</p> <p>I have tried a git status, which did not help</p> <pre><code># Unmerged paths: ... # deleted by them: MyProject.xcodeproj/project.xcworkspace/xcuserdata/ian.xcuserdatad/UserInterfaceState.xcuserstate # # Changes not staged for commit: ... # # deleted: MyProject.xcodeproj/xcuserdata/ian.xcuserdatad/xcschemes/QuollEyeTree.xcscheme </code></pre> <p>I tried a git reset HEAD, but this did not seem to help, and I do not know where to go from here.</p> <p>Git is handy for checking code against previous versions, but I get into trouble whenever I try to swap versions.</p> <p>My current problems seem to have been exacerbated when I tried to create a workspace and add another project. The original project was created under Xcode 3 and the project and files are immediately under the project directory.</p> <p>EDIT - Resolved</p> <p>The answers below did not resolve the issue, but both were helpful.</p> <p>I saved my code from the project directory, removed the latest branch with</p> <pre><code>git reset --hard HEAD~1 </code></pre> <p>then copied the changed files back to the project directory</p> <p>I also updated my .gitignore (which I thought I had done before)</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload