Permalink
Browse files

Document conflicts in `db/schema.rb` [ci skip]

  • Loading branch information...
1 parent 125cc78 commit b48bc869fa55a1b4622ca316a9b62b6da901402f Leandro Facchinetti committed May 14, 2014
Showing with 5 additions and 0 deletions.
  1. +5 −0 guides/source/migrations.md
@@ -902,6 +902,11 @@ schema into a RDBMS other than the one used to create it.
Because schema dumps are the authoritative source for your database schema, it
is strongly recommended that you check them into source control.
+`db/schema.rb` contains the current version number of the database. This
+ensures conflicts are going to happen in the case of a merge where both
+branches touched the schema. When that happens, solve conflicts manually,
+keeping the highest version number of the two.
+
Active Record and Referential Integrity
---------------------------------------

0 comments on commit b48bc86

Please sign in to comment.