What happens if there are conflicts during a cherry-pick?

If there are conflicts during a cherry-pick, Git will pause the cherry-pick process and prompt you to resolve the conflicts. This is similar to how merge conflicts are handled. You will need to manually resolve the conflicting changes in the affected files, stage the resolved files, and then continue the cherry-pick process by running:

git cherry-pick --continue

If you decide not to proceed with the cherry-pick after encountering conflicts, you can abort the process using:

git cherry-pick --abort

This will revert your branch back to the state it was in before the cherry-pick attempt.