Skip to content

Commit 59741ef

Browse files
add --ff-only flag
add --ff-only flag to cesium.com branch merge
1 parent 408dcdd commit 59741ef

File tree

1 file changed

+1
-1
lines changed
  • Documentation/Contributors/ReleaseGuide

1 file changed

+1
-1
lines changed

Documentation/Contributors/ReleaseGuide/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ There is no one release manager; instead, [our community shares the responsibili
7373
- `npm publish -w @cesium/engine`
7474
- `npm publish -w @cesium/widgets`
7575
29. Publish the top-level `cesium` package to npm by running `npm publish` in the repository root (not the unzipped file directory) (the first time you do this, you will need to authorize the machine using `npm adduser`).
76-
30. Check out the `cesium.com` branch. Merge the new release tag into the `cesium.com` branch `git merge origin <tag-name>`. CI will deploy the hosted release, Sandcastle, and the updated doc when you push the branch up.
76+
30. Check out the `cesium.com` branch. Merge the new release tag into the `cesium.com` branch `git merge origin <tag-name> --ff-only`. CI will deploy the hosted release, Sandcastle, and the updated doc when you push the branch up.
7777
31. After the `cesium.com` branch is live on cesium.com, comment in the `Communications` channel in Teams to notify comms that the release is done so they can add these highlights and publish the monthly blog post
7878
- Note, it may take a little while for the new version of CesiumJS to be live on cesium.com (~30 minutes after the branch builds). You can check the version of Cesium in [sandcastle](https://sandcastle.cesium.com/) by looking at the tab above the cesium pane.
7979
32. Continue to the [Cesium Analytics release](https://github.com/CesiumGS/cesium-analytics/tree/main/Documentation/ReleaseGuide)

0 commit comments

Comments
 (0)