Integrate merge_db_schema into the CE upstream code
https://github.com/pocke/merge_db_schema can be used to resolve version merge conflicts in db/schema.rb
, which is the number 1 Ruby file in terms of merge conflicts.
Code that probably has to be changed: https://gitlab.com/gitlab-org/release-tools/blob/48243e39c23b16482ff0ba080c3c68615cc8c5d7/lib/upstream_merge.rb#L40
cc @rymai