Skip to content

fix: extract noop everywhere#3559

Merged
Uzlopak merged 1 commit intomainfrom
noop-2
Sep 8, 2024
Merged

fix: extract noop everywhere#3559
Uzlopak merged 1 commit intomainfrom
noop-2

Conversation

@Uzlopak
Copy link
Contributor

@Uzlopak Uzlopak commented Sep 6, 2024

extract noops

@Uzlopak Uzlopak requested a review from mcollina September 6, 2024 22:09
@Uzlopak Uzlopak merged commit 7f0f6c9 into main Sep 8, 2024
@Uzlopak Uzlopak deleted the noop-2 branch September 8, 2024 10:24
@github-actions
Copy link
Contributor

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

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

Uzlopak added a commit that referenced this pull request Oct 12, 2024
(cherry picked from commit 7f0f6c9)
mcollina pushed a commit that referenced this pull request Oct 13, 2024
@github-actions github-actions bot mentioned this pull request Dec 3, 2024
This was referenced Dec 16, 2024
@github-actions github-actions bot mentioned this pull request Mar 12, 2025
@github-actions github-actions bot mentioned this pull request May 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

2 participants