From 9cf440ae2ded902cd157a0f50e626e2045309fa7 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Tue, 27 Sep 2022 05:02:46 -0700 Subject: [PATCH] Explain git-fu in reldocs --- doc/release-process.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/release-process.md b/doc/release-process.md index d631104a4..94a4a5ba3 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -92,8 +92,9 @@ 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` + - Merge dev into master: `git checkout master; git pull && git merge --no-ff dev && git push` - 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) - Use util/gen-linux-binary-release.sh to make a Linux release binary - Use util/build-debian-package.sh to make an x86 Debian package for the release