title: GIT: How dangerous is "deleted by us" conflict?
body: <p>A few days ago I made a new branch called "new_branch" based on "master". While I worked on my "new_branch" with file "file.php", a second developer on his branch deleted the file "file.php" and merged his branch with "master". Now I need to rebase my branch on current "master". After the command <code>git pull --rebase origin master</code> I have the conflict</p>
  
  <blockquote>
    <p>deleted by us:   app/file.php</p>
  </blockquote>
  
  <p>I don't know what to do, I don't want to lose changes I've made in this file. After commands</p>
  
  <pre><code>git add -A
  git rebase --continue 
  </code></pre>
  
  <p>will the file disappear in my "new_branch"?</p>