-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: prepare for merging go1.17.11
- Loading branch information
1 parent
b149a12
commit 8f8156f
Showing
1 changed file
with
3 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -223,13 +223,13 @@ minor changes (e.g., updating docs) directly on the `main` branch. | |
|
||
```bash | ||
set -ex | ||
git checkout main | ||
git checkout go1.17 | ||
git remote add golang [email protected]:golang/go.git || git fetch golang | ||
git branch -D golang-upstream golang-http-upstream merged-main || true | ||
git fetch golang | ||
git checkout -b golang-upstream go1.17.10 | ||
git checkout -b golang-upstream go1.17.11 | ||
git subtree split -P src/net/http/ -b golang-http-upstream | ||
git checkout main | ||
git checkout go1.17 | ||
git checkout -b merged-main | ||
git merge golang-http-upstream | ||
``` | ||
|