From 1359acf5fdfedb985355c040a82f6a6936717981 Mon Sep 17 00:00:00 2001 From: JulioV Date: Sat, 12 Dec 2020 17:13:04 -0500 Subject: [PATCH] Update git flow --- docs/developers/git-flow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/developers/git-flow.md b/docs/developers/git-flow.md index 0e1ef808..130524b1 100644 --- a/docs/developers/git-flow.md +++ b/docs/developers/git-flow.md @@ -29,6 +29,7 @@ git commit -m "Add my new feature" # use a concise description ```bash git checkout feature/feature1 + git pull origin develop git rebase -i develop git checkout develop git merge --no-ff feature/feature1 # (use the default merge message)