|
|
|
@ -92,7 +92,8 @@ Install deps on Linux: |
|
|
|
- To get the stats of file changes: `git diff --stat master...dev` |
|
|
|
- Do a fresh clone and fresh 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 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) |
|
|
|
|
Jonathan "Duke" Leto
2 years ago