From 79d7ec6ed0b9649f091fa7793699ec6ecc568066 Mon Sep 17 00:00:00 2001 From: anacmontoya <142039433+anacmontoya@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:53:15 -0600 Subject: [PATCH] Update foundations/github/git-branches.md Co-authored-by: Brian Rose --- foundations/github/git-branches.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundations/github/git-branches.md b/foundations/github/git-branches.md index c3843ffdb..aa713ad85 100644 --- a/foundations/github/git-branches.md +++ b/foundations/github/git-branches.md @@ -288,7 +288,7 @@ All in all your Git Branching workflow should resemble this flow: 1. Add and commit changes in branch 1. Push commits to fork (Set an upstream branch only for first push) 1. Repeat last three steps as necessary -1. Merge via Pull Request +1. Merge into upstream main branch via Pull Request 1. Delete branch from clone and fork 1. Pull upstream changes to fork and clone