SVN confusion: "local add, incoming add upon merge" What do the words actually refer to? <p>I'm pretty new to subversion and the docs just aren't making sense to me. I was wondering if someone could break down this error message (from <code>svn st</code>) into plain English, as well as the other one I get <code>local delete, incoming delete upon merge</code>. </p> <p>To be precise about my question:</p> <ol> <li>What does <code>local add</code> (or <code>local delete</code>) refer to?</li> <li>What does <code>incoming add</code> (or <code>incoming delete</code>) refer to?</li> </ol> <p>What's mystifying to me is that the branch has absolutely nothing to do with the files that receive these errors. In other words, it doesn't add or delete any of these files locally (what I presume <code>local add/delete</code> means). Besides, if I had deleted the file locally, why would that be in conflict with a deletion in the repo (<code>incoming</code>) anyway?</p> <h2>Background Information</h2> <p>How I got here: I merged <code>trunk</code> into my <code>branch</code> and am trying to commit to my branch.</p> <p>P.S. I've (tried to) read <a href="http://stackoverflow.com/a/12874875/1431728">Managing trunk and feature branches: local delete, incoming delete upon merge</a>, but there's too much terminology. Other questions/answers I've read here on SO don't seem to apply or else are hard to understand.</p>