messanjah
/ structure_in_conflict
Last active
January 21, 2019 14:16
Steps to commit a cleanly merged db/structure.sql file
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Dealing with conflicts to db/structure.sql (when merging master) | |
| $ git checkout master | |
| # Change database.yml to point to database: clean (on localhost) in development env | |
| # In one command: | |
| # 1) drops the database specified in database.yml for current env ('clean' database) | |
| # 2) creates a db with name specified in database.yml | |
| # 3) loads master's structure into the database specified in database.yml |