From 517e16f1b0c70f87b9dc24b5d6da47201c4df0f0 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Tue, 27 Sep 2022 05:04:31 -0700 Subject: [PATCH] Ensure local dev branch is up-to-date before merging dev --- 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 94a4a5ba3..cdfbeec24 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -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)