Skip to content

Conversation

@l-trotta
Copy link
Contributor

@l-trotta l-trotta commented Mar 3, 2025

@l-trotta l-trotta merged commit 5b9a58f into main Mar 4, 2025
18 checks passed
@l-trotta l-trotta deleted the add-geo-grid branch March 4, 2025 08:58
github-actions bot pushed a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)
@github-actions
Copy link
Contributor

github-actions bot commented Mar 4, 2025

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

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

github-actions bot pushed a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)
github-actions bot pushed a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)
github-actions bot pushed a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)
l-trotta added a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)

Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
l-trotta added a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)

Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
l-trotta added a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)

Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
l-trotta added a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)

Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
l-trotta added a commit that referenced this pull request Mar 4, 2025
(cherry picked from commit 5b9a58f)

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants