-
At the first conflict, unstage the schema diff from your new branch:
git reset HEAD db/schema.rb -
Discard the schema diff from your new branch:
git checkout db/schema.rb -
Rebuild the schema:
rake db:migrate -
Check the resulting schema diff against the original diff on your branch (e.g. by looking at the commit on the pull request) - it should be identical
-
Continue rebase
Last active
October 2, 2017 14:57
-
-
Save timup/c1e7c3f1cfb956863b866d5fc775f12b to your computer and use it in GitHub Desktop.
Recover from Rails schema merge conflict
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment