Browse Source

Merge remote-tracking branch 'origin/dev' into jahway603

pull/217/head
jahway603 2 years ago
parent
commit
870ed35fb5
  1. 2
      doc/release-process.md
  2. 6
      doc/relnotes/README.md

2
doc/release-process.md

@ -4,6 +4,8 @@
Beware of making high-risk changes (such as consensus changes, p2p layer changes and wallet/transaction changes) too close to a new release, because they will not get as much testing as they should. Don't merge large branches which haven't undergone lots of testing just before a release.
It is best to keep doc/relnotes/README.md up to date as changes and bug fixes are made. It's more work to summarize all changes and bugfixes just before the release.
## Check for changes on master that should be on dev
Often there are trivial changes made directly on master, such as documentation changes. In theory, no code changes should happen on master without being on dev first, but it's better to be safe than sorry. We want the dev branch which undergoes testing to be as close as possible to what the master branch will become, so we don't want to merge dev into master and just assume everything works. So it's best to merge the master branch into dev just before merging the dev branch into master.

6
doc/relnotes/README.md

@ -10,6 +10,12 @@ and no longer on Github, since they banned Duke Leto and
also because they censor many people around the world and work with
evil organizations.
# Hush 3.9.3 "XXX"
```
...
```
# Hush 3.9.2 "Anecdotal Axolotl"
```

Loading…
Cancel
Save