title: How to update the database snapshot to match the database after changes have been made to the model
body: <p>Using Entity FrameWork 6.1.3. and Code First.</p>
  
  <p>I'm currently working in my own branch, but using a development database. Another developer has been working in the main branch and has applied some migrations to the development database after I had branched. I made some changes to some of the models in my branch by adding extra fields; the tables for these models I modified already exist on the database (apart from 1 new model).</p>
  
  <p>The current snapshot in my branch is not what the actual database schema currently is. Normally I would do a <code>Add-Migration Merge -IgnoreChanges</code> to bring me up to date and then make my changes. (Correct?)</p>
  
  <p>The problem is that I have changes I have made that I still need to be applied to the database and doing the above command ignores these changes. The code generated when I scaffold a new migration is trying to undo (drop/alter) all of the migrations that were applied on the main branch, and it also currently sees all of the models that I have made changes to (and some other models) as new tables and is trying to create the new tables instead of adding the new columns.</p>
  
  <p>What is the best way to solve this and is it possible to avoid situations like this in the first place?</p>
  
  <p>I was thinking that I could merge the main branch into my branch to get the migrations, but wasn't sure if that would solve my problem.</p>
  
  <p>Any migrations generated will also need to work when applied to our production database.</p>
  
  <p>Hope I've explained this well enough. I'm still quite new to EF so any help will be appreciated.</p>