DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure local dev branch is up-to-date before merging dev

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2022-09-27 05:04:31 -07:00
parent 9cf440ae2d
commit 517e16f1b0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/release-process.md
View File

@@ -92,7 +92,8 @@ Install deps on Linux:
- To get the stats of file changes: `git diff --stat master...dev` - To get the stats of file changes: `git diff --stat master...dev`
- Do a fresh clone and fresh sync with new checkpoints - Do a fresh clone and fresh sync with new checkpoints
- Stop node, wait 20 minutes, and then do a partial sync with new checkpoints - Stop node, wait 20 minutes, and then do a partial sync with new checkpoints
- Merge dev into master: `git checkout master; git pull && git merge --no-ff dev && git push` - Merge dev into master: `git checkout dev && git pull && git checkout master && git pull && git merge --no-ff dev && git push`
- The above command makes sure that your local dev branch is up to date before doing anything
- The above command will not merge if "git pull" creates a merge conflict - The above command will not merge if "git pull" creates a merge conflict
- The above command will not push if there is a problem with merging dev - The above command will not push if there is a problem with merging dev
- Make Gitea release with git tag from master branch (make sure to merge dev in first) - Make Gitea release with git tag from master branch (make sure to merge dev in first)