-
Notifications
You must be signed in to change notification settings - Fork 542
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
chore(rel): update latest tags #1151
Conversation
Merge activity
|
We never backported this to the 6.0 branch? |
The backport to
To backport this PR manually, you can either: Via the sg toolUse the sg backport -r 6.0.x -p 1151 Via your terminalTo 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-6.0.x 6.0.x
# Navigate to the new working tree
cd .worktrees/backport-6.0.x
# Create a new branch
git switch --create backport-1151-to-6.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b13090976591bba0362c8281bed1aea7313c5c44
# Push it to GitHub
git push --set-upstream origin backport-1151-to-6.0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.0.x If you encouter conflict, first resolve the conflict and stage all files, then run the commands below: git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-1151-to-6.0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.0.x
Once the pull request has been created, please ensure the following:
|
Update docker images to latest Sourcegraph release
Checklist
Test plan
CI