Skip to content

Conversation

@lcawl
Copy link
Contributor

@lcawl lcawl commented Sep 25, 2024

This PR addresses an error that occurs when you run the "make overlay-docs" command due to invalid spacing in the overlay file.

@lcawl lcawl added the OpenAPI label Sep 25, 2024
@lcawl lcawl marked this pull request as ready for review September 25, 2024 21:53
@lcawl lcawl requested a review from szabosteve September 25, 2024 21:53
Copy link
Contributor

@szabosteve szabosteve left a comment

Choose a reason for hiding this comment

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

LGTM, thank you for fixing it!

@lcawl lcawl merged commit b8b5b43 into main Sep 26, 2024
7 checks passed
@lcawl lcawl deleted the overlay-typo branch September 26, 2024 15:26
@github-actions
Copy link
Contributor

The backport to 8.x failed:

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

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-8.x 8.x
# Navigate to the new working tree
cd .worktrees/backport-8.x
# Create a new branch
git switch --create backport-2938-to-8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b8b5b43c9d42f53545cf58769a8c1e6ce5e9cd72
# Push it to GitHub
git push --set-upstream origin backport-2938-to-8.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.x

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

@lcawl
Copy link
Contributor Author

lcawl commented Sep 26, 2024

Verified that backport isn't required after all.

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants