diff options
| author | Eric Anderson <ejona@google.com> | 2018-03-28 17:45:00 -0700 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2018-03-29 09:48:35 -0700 |
| commit | 5780743be46ae875f769061d9229fe0f83738b42 (patch) | |
| tree | 98a824664c2e85a728284fa27bd79d57a483757b /RELEASING.md | |
| parent | 4e82e62eaa549d1f63a6548aa0a6ea1687de618f (diff) | |
| download | grpc-grpc-java-5780743be46ae875f769061d9229fe0f83738b42.tar.gz | |
RELEASING.md: Push branch before tag
If the release branch (i.e., v1.11.x) was not up-to-date with the local
repo, then the push to update the branch will fail. Doing it first
allows you to notice, merge in the updates and fix the tag before
pushing it.
Also document pulling the most up-to-date version of the release branch
before creating the 'release' branch. That would reduce the amount of
time the release branch could be modified.
Diffstat (limited to 'RELEASING.md')
| -rw-r--r-- | RELEASING.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/RELEASING.md b/RELEASING.md index 451c67ab6..cbc26905c 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -127,7 +127,9 @@ Tagging the Release version was updated since the last release. ```bash - $ git checkout -b release v$MAJOR.$MINOR.x + $ git checkout v$MAJOR.$MINOR.x + $ git pull upstream v$MAJOR.$MINOR.x + $ git checkout -b release # Bump documented versions. Don't forget protobuf version $ ${EDITOR:-nano -w} README.md $ git commit -a -m "Update README to reference $MAJOR.$MINOR.$PATCH" @@ -160,8 +162,8 @@ Tagging the Release ```bash $ git checkout v$MAJOR.$MINOR.x $ git merge --ff-only release - $ git push upstream v$MAJOR.$MINOR.$PATCH $ git push upstream v$MAJOR.$MINOR.x + $ git push upstream v$MAJOR.$MINOR.$PATCH ``` 6. Close the release milestone. |