title: How to solve Rails merge conflicts with db/structure.sql
body: <p>I was told that I should follow the below steps if make new migrations in my branch and have merge conflicts with master in the <code>db/structure.sql</code> file.</p>
  
  <ol>
  <li>In the branch, <code>bundle exec rake db:drop</code></li>
  <li>In the branch, <code>bundle exec rake db:create</code></li>
  <li>In master, <code>bundle exec rake db:structure:load</code></li>
  <li>In the branch, <code>git merge master</code></li>
  <li>In the branch, <code>bundle exec rake db:migrate</code></li>
  </ol>
  
  <p>What are steps 1-3 necessary if all I want to do is align the <code>db/structure.sql</code> file? By merging in master, don't I get the new migrations I haven't ran yet and then by running them, it will update my <code>db/structure.sql</code>?</p>