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

[Backport release-2.20] Failed to backport #4759 #4764

Closed
github-actions bot opened this issue Feb 26, 2024 · 0 comments
Closed

[Backport release-2.20] Failed to backport #4759 #4764

github-actions bot opened this issue Feb 26, 2024 · 0 comments
Assignees
Labels
backport tags commits to backport to release branch

Comments

@github-actions
Copy link
Contributor

This issue was created automatically because the backport of #4759 to release-2.20 failed.

The backport to release-2.20 failed:

Auto-merging tiledb/sm/fragment/fragment_metadata.cc
CONFLICT (content): Merge conflict in tiledb/sm/fragment/fragment_metadata.cc
Auto-merging tiledb/sm/fragment/fragment_metadata.h
Auto-merging tiledb/sm/rtree/test/compile_rtree_main.cc
Auto-merging tiledb/sm/serialization/fragment_metadata.cc
error: could not apply c1e342750... Add memory tracking for RTree. (#4697)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

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

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

@github-actions github-actions bot added the backport tags commits to backport to release branch label Feb 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport tags commits to backport to release branch
Projects
None yet
Development

No branches or pull requests

1 participant