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

fix a doc reference typo in CONTRIBUTING.md #6255

Merged

Conversation

seraphjiang
Copy link
Member

Description

the doc reference in CONTRIBUTING.md link to COMMUNICATIONS.md is wrong.

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@seraphjiang seraphjiang self-assigned this Mar 24, 2024
@seraphjiang seraphjiang added Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry backport 2.x docs Improvements or additions to documentation labels Mar 24, 2024
@xinruiba xinruiba merged commit f27e80a into opensearch-project:main Mar 25, 2024
13 of 32 checks passed
@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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-6255-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f27e80aa4331f55bbff66abb5c1c3cdef2b84b7f
# Push it to GitHub
git push --set-upstream origin backport/backport-6255-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

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

@xinruiba
Copy link
Member

xinruiba commented Jun 5, 2024

Don't think this change need to be back-port into 2.x release branch. Propose to remove the back-port label from this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x docs Improvements or additions to documentation first-time-contributor Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants