TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #15113 from leafac/document-schema-conflicts

Browse Source 
Document conflicts in `db/schema.rb` [ci skip]
This commit is contained in:
Rafael Mendonça França 2014-05-16 13:11:33 -03:00
commit f3de18278e
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
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
---------------------------------------