TileDB-Inc / TileDB-VCF

Efficient variant-call data storage and retrieval library using the TileDB storage library.
https://tiledb-inc.github.io/TileDB-VCF/
MIT License
82 stars 13 forks source link

[Backport release-0.31] Failed to backport #712 #713

Closed github-actions[bot] closed 2 months ago

github-actions[bot] commented 2 months ago

This issue was created automatically because the backport of #712 to release-0.31 failed.

The backport to release-0.31 failed:

Auto-merging apis/python/tests/test_tiledbvcf.py
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch backport-712-to-release-0.31
You are currently cherry-picking commit 69c30d43.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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

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