diff --git a/gitflow.txt b/gitflow.txt index 0be54022..4198302a 100644 --- a/gitflow.txt +++ b/gitflow.txt @@ -29,10 +29,14 @@ 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 +