Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the match_only_text rewrite fix to release notes #14251

Merged

Conversation

rishabhmaurya
Copy link
Contributor

Description

Add the match_only_text rewrite fix to release notes

Related Issues

Resolves #14156

Check List

  • [ ] Functionality includes testing.
  • [ ] API changes companion pull request created, if applicable.
  • [ ] Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Rishabh Maurya <rishabhmaurya05@gmail.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-14251-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0d82a5847268efe3b12ebbc16aa0b70fc786fc65
# Push it to GitHub
git push --set-upstream origin backport/backport-14251-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-14251-to-2.x.

@reta reta removed the backport 2.x Backport to 2.x branch label Jun 13, 2024
@reta
Copy link
Collaborator

reta commented Jun 13, 2024

@rishabhmaurya could you please forward port it to 2.x and main? thank you

@rishabhmaurya
Copy link
Contributor Author

@reta please find below forward port PRs, thank you.
2.x - #14285
main - #14286

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants