kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

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

Browse source
This commit is contained in:
Leandro Facchinetti 2014-05-14 18:43:57 -03:00
parent 125cc780c5
commit b48bc869fa
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
guides/source/migrations.md
View file

@ -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 Because schema dumps are the authoritative source for your database schema, it
is strongly recommended that you check them into source control. 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 Active Record and Referential Integrity
--------------------------------------- ---------------------------------------