kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-29 12:15:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs: update changelog and readme

Browse Source
This commit is contained in:
Pavitthra Pandurangan
2022-02-07 10:51:15 -05:00
parent 59a4429015
commit c252794e3d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@@ -462,7 +462,10 @@ is tagged.
1. Once the final release candidate has rolled out successfully without issue on the
above staging infrastructure, the release manager tags 2 additional `stacks-blockchain`
team members to review the `develop -> master` PR.
team members to review the `develop -> master` PR. If there is a merge conflict in this
PR, this is the protocol: open a branch off of develop, merge master into that branch,
and then open a PR from this side branch to develop. The merge conflicts will be
resolved.
1. Once reviewed and approved, the release manager merges the PR, and tags the release
via the [`stacks-blockchain` Github action]((https://github.com/blockstack/stacks-blockchain/actions/workflows/stacks-blockchain.yml))