Skip to content

Re-add merge driver for db/schema.rb

Yorick Peterse requested to merge improve-merging-to-ee into master

This ensures that even with the -Xours option, we take the latest schema version when merging changes into EE.

Merge request reports