Skip to content

Conversation

l-trotta
Copy link
Contributor

No description provided.

@l-trotta l-trotta requested a review from pquentin May 28, 2024 13:27
Copy link
Member

@pquentin pquentin left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM.

@l-trotta l-trotta merged commit 8c343a6 into main May 28, 2024
@l-trotta l-trotta deleted the example-advertisement branch May 28, 2024 15:08
Copy link

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

Then, create a pull request where the base branch is 7.17 and the compare/head branch is backport-819-to-7.17.

github-actions bot pushed a commit that referenced this pull request May 28, 2024
github-actions bot pushed a commit that referenced this pull request May 28, 2024
l-trotta added a commit that referenced this pull request May 28, 2024
Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
l-trotta added a commit that referenced this pull request May 28, 2024
Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2 participants