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

chore: add comments, cleanup, consolidate x/oracle #440

Merged
merged 5 commits into from
Nov 22, 2024
Merged

Conversation

akremstudy
Copy link
Contributor

No description provided.

@akremstudy akremstudy marked this pull request as ready for review November 22, 2024 04:42
@themandalore themandalore merged commit e6cff29 into main Nov 22, 2024
6 checks passed
@themandalore themandalore deleted the add-comments2 branch November 22, 2024 15:03
Copy link
Contributor

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

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

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