Git cherry-pick errors if there are merge commits

[MicaelJarniac]

error: commit *** is a merge but no -m option was given.
fatal: cherry-pick failed

For context, I'm trying to port the changes between MicaelJarniac/crustypy-instance@09dc8e3 and MicaelJarniac/crustypy-instance@f27d87c into MicaelJarniac/crustypy@f7810b7.

The exact error I get is:

❯ git cherry-pick --continue
[poetry 5f659aa] docs: Poetry
 Date: Fri Jul 14 16:11:39 2023 -0300
 5 files changed, 33 insertions(+), 36 deletions(-)
[poetry 3b3bc68] chore: remove `semver` dep
 Date: Fri Jul 14 16:12:21 2023 -0300
 1 file changed, 1 deletion(-)
[poetry ec0d9d9] build(deps): update lockfile
 Date: Fri Jul 14 16:13:33 2023 -0300
 1 file changed, 58 insertions(+), 57 deletions(-)
error: commit ff274ac806205a1339462db15c47bc99848b5cbb is a merge but no -m option was given.
fatal: cherry-pick failed

Which is related to this commit I think: MicaelJarniac/crustypy-instance@ce2e6e8

Here's the command I ran:

retrocookie ../crustypy-instance/ old.. --exclude-variable use_discord_community --exclude-variable year

Also note that to use .cruft.json instead of .cookiecutter.json, I'm using the branch from this PR:

• Add cruft compatibility, read from .cruft.json #756

[MicaelJarniac]

I'm trying to rebase my instance repo to see if it helps.

[MicaelJarniac]

Rebasing to get rid of merge commits did work.