From e2869925acaf6100c5865357a886c33189312d83 Mon Sep 17 00:00:00 2001 From: Ross Thompson Date: Mon, 23 Jan 2023 17:50:25 -0600 Subject: [PATCH] Updated gitflow instructions. --- gitflow.txt | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gitflow.txt b/gitflow.txt index 0be54022f..3ff71a549 100644 --- a/gitflow.txt +++ b/gitflow.txt @@ -9,7 +9,7 @@ ## except in compliance with the License, or, at your option, the Apache License version 2.0. You ## may obtain a copy of the License at ## -## https:##solderpad.org/licenses/SHL-2.1/ +## https://solderpad.org/licenses/SHL-2.1/ ## ## Unless required by applicable law or agreed to in writing, any work distributed under the ## License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, @@ -29,10 +29,17 @@ Once per sessiosn Fetch upstream and sync fork 1. git fetch upstream -2. git push +2. git merge upstream/main Create pull request -1. gh pr create -2. Must include a title and strongly encourage a body message explaining your changes. -3. Wait for pull request to be approved, rejected, or needs changes. -4. Finish by fetching the upstream and pushing back to your fork. +1. git fetch upstream +2. git merge upstream/main +3. git push +4. gh pr create +5. Must include a title and strongly encourage a body message explaining your changes. +6. Wait for pull request to be approved, rejected, or needs changes. +7. Finish by fetching the upstream and pushing back to your fork. + 1. git fetch upstream + 2. git merge upstream/main + 3. git push +