Skip to content

Conversation

seanpmorgan
Copy link
Member

Description

Need to update ABI compatibility on nightly and 0.12

@WindQAQ WindQAQ merged commit 40c6039 into master Dec 19, 2020
@bot-of-gabrieldemarmiesse

The backport to r0.12 failed:

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

Then, create a pull request where the base branch is r0.12 and the compare/head branch is backport-2306-to-r0.12.

@seanpmorgan seanpmorgan deleted the update-abi-compat branch December 19, 2020 03:22
@seanpmorgan seanpmorgan restored the update-abi-compat branch December 20, 2020 04:08
@seanpmorgan seanpmorgan deleted the update-abi-compat branch December 22, 2020 01:07
jrruijli pushed a commit to jrruijli/addons that referenced this pull request Dec 23, 2020
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