StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>the error-message is pretty specific in what you ought to do: either <em>commit</em> the file (if you want to keep the changes) or <em>discard</em> it (if you don't care about the changes).</p> <p>the cuser-files are usually hidden deep in the xcode-project, so you might want to provide the full path to them (the following examples use <code>find</code> to find those files in subdirectories)</p> <h2>commit</h2> <p>this will commit <em>all</em> cuser-files in your current directory:</p> <pre><code>$ git add $(find . -name "*.xcuserstate" -or -name "*.xcuserdata") $ git commit $(find . -name "*.xcuserstate" -or -name "*.xcuserdata") -m "updated xcuser stuff" </code></pre> <h2>discard</h2> <p>this will discard changes from <em>all</em> cuser-files in your current directory:</p> <pre><code>$ git checkout $(find . -name "*.xcuserstate" -or -name "*.xcuserdata") </code></pre> <p>generally you don't want to track the xcuser-stuff at all, so you should remove it from the repository and make sure it doesn't get added accidentally:</p> <pre><code># remove cuser-stuff from the repository (but not locally) $ git rm --cached $(find . -name "*.xcuserstate" -or -name "*.xcuserdata") # commit the file removal $ git commit $(find . -name "*.xcuserstate" -or -name "*.xcuserdata") -m "don't track cuser stuff" # prevent the cuser-stuff from accidentally adding it $ echo "*.cuserdata" > .gitignore $ echo "*.cuserstate" > .gitignore $ git add .gitignore $ git commit .gitignore -m "don't track user-specific data" </code></pre>

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