title: What is the preferred way to manage schema.rb in git?
body: <p>I don't want to add <code>schema.rb</code> to <code>.gitignore</code>, because I want to be able to load a new database schema from that file.  However, keeping it checked in is causing all sorts of spurious conflicts that are easily resolved by a fresh <code>db:migrate:reset</code>.</p>
  
  <p>Basically I want a way to:</p>
  
  <ol start="2">
  <li>Keep schema.rb in the repository for deploy-time database setup</li>
  <li>Keep schema.rb in '.gitignore' for general development</li>
  </ol>
  
  <p>There would be one or two people responsible for updating <code>schema.rb</code> and knowing that it was correct.</p>
  
  <p>Is there a way I can have my cake and eat it, too?</p>