git stash pop prints "deleted by us" for file that was never created on master <p>I am relatively new to git (coming from svn).</p> <p>I perform the following steps which are mainly that I edit a file on a branch, perform a stash and then try to apply the stash to the master (which does not have this file).:</p> <pre><code>user1:~/gittest$ ls user1:~/gittest$ git init Initialized empty Git repository in /home/user1/gittest/.git/ user1:~/gittest$ touch file1 user1:~/gittest$ git add file1 user1:~/gittest$ git commit -m "committing file1" [master (root-commit) 7c29335] committing file1 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 file1 user1:~/gittest$ git checkout -b br1 Switched to a new branch 'br1' user1:~/gittest$ touch file2 user1:~/gittest$ git add file2 user1:~/gittest$ git commit -m "committing file2" [br1 b565401] committing file2 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 file2 user1:~/gittest$ echo "updated.." &gt;&gt; file2 user1:~/gittest$ git add file2 user1:~/gittest$ git stash Saved working directory and index state WIP on br1: b565401 committing file2 HEAD is now at b565401 committing file2 user1:~/gittest$ git checkout master Switched to branch 'master' user1:~/gittest$ git stash pop CONFLICT (modify/delete): file2 deleted in Updated upstream and modified in Stashed changes. Version Stashed changes of file2 left in tree. user1:~/gittest$ git status On branch master Unmerged paths: (use "git reset HEAD &lt;file&gt;..." to unstage) (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution) deleted by us: file2 no changes added to commit (use "git add" and/or "git commit -a") </code></pre> <p>My question is why does git print the message "deleted by us" since file2 was never created on master and thus never deleted.</p> <p>Is this a misleading message, or am I missing something about the way git works.</p>