Add merge migration to merge 2 heads - Githubissues

galaxyproject / galaxy

Data intensive science for everyone.

https://galaxyproject.org

Other

1.42k stars 1.01k forks source link

Add merge migration to merge 2 heads #19163

Closed jdavcs closed 1 week ago

jdavcs commented 1 week ago

Fixes broken migration lineage introduced by merging #18966 and #15860 both of which contain migrations pointing to the same parent migration, which resulted in two head migrations.

How to test the changes?

(Select all options that apply)

[ ] I've included appropriate automated tests.
[ ] This is a refactoring of components with existing test coverage.
[ ] Instructions for manual testing are as follows:
1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

[x] I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.