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

Revert commit to restore glossary content #3166

Merged
merged 2 commits into from
Oct 12, 2023

Conversation

awharn
Copy link
Member

@awharn awharn commented Oct 12, 2023

Revert "Revert "Merge branch 'docs-staging' of https://github.com/zowe/docs-site into docs-staging""

This reverts commit a1e5df6.
Signed-off-by: Andrew W. Harn [email protected]

Your checklist for this pull request

🚨Please review the guidelines for contributing to this repository.

  • If the changes in this PR is part of the next future release, make this pull request against the docs-staging branch which will be published at the next release boundary. If the changes in this PR are part of the current release, use the default base branch, master. For more information about branches, see https://github.com/zowe/docs-site/tree/master#understanding-the-doc-branches.

  • If this PR relates to GitHub issues in docs-site or other repositories, please list in Description, prefixed with close, fix or resolve keywords.

Description (including links to related git issues)

Reverts a revert commit that inadvertently removed glossary content

❤️Thank you!

…e/docs-site into docs-staging""

This reverts commit a1e5df6.
Signed-off-by: Andrew W. Harn <[email protected]>
@awharn awharn requested a review from anaxceron October 12, 2023 14:49
@github-actions
Copy link

@github-actions github-actions bot temporarily deployed to pull request October 12, 2023 15:29 Inactive
Copy link
Collaborator

@anaxceron anaxceron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for figuring this out and getting the glossary online!

@anaxceron anaxceron merged commit 981f49e into master Oct 12, 2023
2 of 3 checks passed
@anaxceron anaxceron deleted the attempt-recovery-of-glossary-content branch October 12, 2023 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants