Rebases the wrong migration when merging branches

[tolomea]

When merging a branch (e.g. main) into the current one I would expect the current branches migrations to rebase on top of the incoming branches ones, similar to if you rebase onto main instead of merging main. However instead it rebased the migrations in main. I suspect this is because ours and theirs are reversed in rebases vs merges.

[adamchainz]

The rebase-migration command is for rebases. I guess we could take a flag, or have a different command, for merges.

[tolomea]

is there currently a work flow for merges?

[adamchainz]

No, nothing currently. I always rebase so it doesn't affect me.

[dmitrysleptsov]

@adamchainz , I found myself in the same situation as I'm mostly using git merge command. What do you think about moving find_migration_names function inside Command here. It would allow to simply inherit the class and add any custom logic to deal with git merge ourselves.

I can prepare a PR

[adamchainz]

Released in 2.8.0, thanks @dmitrysleptsov 🎉