Automatically resolve schema.rb version conflicts (!477) · Merge requests · GitLab.org / release-tools · GitLab

Yorick Peterse requested to merge db-schema-merge-conflicts into master Oct 30, 2018

This adds the use of merge_db_schema which, which combined with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22692 can be used to automatically resolve conflicts with the version identifier in db/schema.rb.

Fixes https://gitlab.com/gitlab-org/release/framework/issues/42