[Backport 2.4] Typo, Send the welcome email #6661
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #6660
Error on cherry picking:
Error on backporting to branch 2.4, error on cherry picking ['bd1596c61fc08b6b8f35abf2ef5646fa4deefbe7', 'a0fcc643b34a327fecb2066ecece9f89bad2ea2f']:
error: could not apply a0fcc64... Send the welcome email
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'
To continue do:
git fetch
git checkout backport/6660-to-2.4
git reset --hard HEAD^
git cherry-pick a0fcc64
git push origin backport/6660-to-2.4 --force