title: Does Git not generate a merge conflict when moving/deleting a section of code that contains changes from another squash?
body: <p>To trace back the events in chronological order:</p>
  <ol>
  <li>User 1: started working on a feature.  He creates a branch off the
  main branch.</li>
  <li>User 1: Moved a list of entries from a parent class to child
  classes, deleting a section of code, but the branch requires
  additional significant refactoring.  Squashing is delayed until the
  refactoring is complete.</li>
  <li>User 2: To add a much smaller feature, User 2 added an entry to a
  list (that was deleted in User 1's branch) and squashed it into the
  main branch.</li>
  <li>User 1: as part of best practices, merges the main branch into his
  dev branch (regular merge, not squashing).  Does not receive an explicit merge conflict that the
  list he moved/deleted contained an additional entry, thus breaking User 2's new feature.</li>
  </ol>
  <p>So my question is correct behavior on Git's part?  That is possible to delete more code than previously intended, and not throw up a merge conflict?</p>
  <p>Also, as additional information if it helps, we're using BitBucket Cloud.</p>