title: Can't merge in Perforce
body: <p>I have a branch that I created using <code>p4 integrate</code> but now the merge isn't behaving how I expect.  When I merge, I get the following:</p>
  
  <pre><code>$ p4 merge -n ISSUE-49/... trunk/...
  ...
  //depot/products/theProduct/trunk/some/directory/somefile.conf#1 - sync/delete from //depot/products/theProduct/ISSUE-49/some/directory/somefile.conf#1
  ...
  </code></pre>
  
  <p>That file was added on the ISSUE-49 branch (not deleted) so I don't understand why it wants to delete it.</p>
  
  <p>When I try and use <code>p4 integrate</code>, I get:</p>
  
  <pre><code>$ p4 integrate -n ISSUE-49/... trunk/...
  ...
  //depot/products/theProduct/trunk/some/directory/somefile.conf#1 - branch/sync from //depot/products/theProduct/ISSUE-49/some/directory/somefile.conf#1
  ...
  </code></pre>
  
  <p>It looks like it's trying to do a branch instead of a merge.  Is it?  How can I safely merge my changes from ISSUE-49 back into trunk?</p>
  
  <p>I am trying to do this from the command-line on Linux using <code>p4 2012.1</code>.  I have <code>p4v 2013.3</code> on my Windows machine.  I could use that if it would be easier.</p>