Compare commits

..

6 Commits

Author SHA1 Message Date
Duke
5184b4483f Update release process 2023-02-11 19:30:56 -05:00
Duke
f271e60e58 Update release process 2023-02-11 19:29:39 -05:00
Duke
4a2361cdf6 Merge branch 'dev' 2023-02-11 19:27:47 -05:00
Duke
bec27a85e5 Update relnotes 2023-02-11 19:23:55 -05:00
Duke Leto
65b9e74333 Delete 'issue_template.md' 2022-11-03 11:13:38 +00:00
Duke Leto
7bbc291370 Add 'issue_template.md' 2022-11-03 11:11:51 +00:00
2 changed files with 7 additions and 4 deletions

View File

@ -24,9 +24,12 @@ git diff dev...master # look at the set of changes which exist in master but no
If the last command has no output, congrats, there is nothing to do. If the last command has output, then you should merge master into dev: If the last command has no output, congrats, there is nothing to do. If the last command has output, then you should merge master into dev:
``` ```
git checkout master
git merge --no-ff dev # using the default commit message is fine
git push origin master
git checkout dev git checkout dev
git merge --no-ff master # using the default commit message is fine git merge master
git push git push origin dev
``` ```
The `--no-ff` flag above makes sure to make a merge commit, no matter what, even if a "fast forward" could be done. For those in the future looking back, it's much better to see evidence of when branches were merged. The `--no-ff` flag above makes sure to make a merge commit, no matter what, even if a "fast forward" could be done. For those in the future looking back, it's much better to see evidence of when branches were merged.

View File

@ -10,10 +10,10 @@ and no longer on Github, since they banned Duke Leto and
also because they censor many people around the world and work with also because they censor many people around the world and work with
evil organizations. evil organizations.
# Hush 3.9.3 "XXX" # Hush 3.9.3 "Lateral Larvacean"
``` ```
... 1012 files changed, 36253 insertions(+), 5507 deletions(-)
``` ```
This is an OPTIONAL release. It is recommended for exchanges, solo miners and mining pools to update to this release. This is an OPTIONAL release. It is recommended for exchanges, solo miners and mining pools to update to this release.