Closed tkernell closed 1 week ago
The backport to release/v0.x
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-release/v0.x release/v0.x
# Navigate to the new working tree
cd .worktrees/backport-release/v0.x
# Create a new branch
git switch --create backport-304-to-release/v0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 df096a5d2125bb68197f70bd52e51ee587af9724
# Push it to GitHub
git push --set-upstream origin backport-304-to-release/v0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/v0.x
Then, create a pull request where the base
branch is release/v0.x
and the compare
/head
branch is backport-304-to-release/v0.x
.
tip
param for token bridge deposits. goes toclaimDeposit
caller on layer. addresses bootstrapping problem where user has no trb on layer to pay gas forclaimDeposit
call.