From 271fa27d1e13d62831f3f54ffe0e0f4fef28bd1f Mon Sep 17 00:00:00 2001 From: Ross Thompson Date: Tue, 24 Jan 2023 13:24:44 -0600 Subject: [PATCH] Updated git flow documentation. --- gitflow.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitflow.txt b/gitflow.txt index bc89d2bf..57d79333 100644 --- a/gitflow.txt +++ b/gitflow.txt @@ -35,19 +35,16 @@ Once per session (This authorizes gh to use your github account) 3. Copy one-time code from terminal to browser Fetch upstream and sync fork -1. git fetch upstream # fetch the upstream openhwgroup/cvw into your local clone -2. git merge upstream/main # merge the upstream openhwgroup/cvw into your local clone -3. git push # pushes changes back to your fork. Now all three should be in sync +1. git pull upstream main # fetch and merge the upstream openhwgroup/cvw into your local clone +2. git push # pushes changes back to your fork. Now all three should be in sync Create pull request -1. git fetch upstream # fetch the upstream openhwgroup/cvw into your local clone -2. git merge upstream/main # merge the upstream openhwgroup/cvw into your local clone +1. git pull upstream main # fetch and merge the upstream openhwgroup/cvw into your local clone 3. git push # pushes changes back to your fork. Now all three should be in sync 4. gh pr create # Create a pull request. 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 # sync your clone with the upstream - 3. git push # sync your fork with the upstream and clone + 1. git pull upstream main # fetch and merge the upstream openhwgroup/cvw into your local clone + 3. git push # sync your fork with the upstream and clone