Skip to content

Instantly share code, notes, and snippets.

@made-by-chris
Created August 31, 2022 09:36
Show Gist options
  • Save made-by-chris/82440cb3c92d64843fa55202f6944df5 to your computer and use it in GitHub Desktop.
Save made-by-chris/82440cb3c92d64843fa55202f6944df5 to your computer and use it in GitHub Desktop.
git flow
cd
cd projects
git clone https://zansproject.com < 10:00 am
(Fi and Zan finalise a PR together) < 10:20 am
cd zansproject
git checkout -b my_feature_X_branch < 10:30am
touch main.js
git add main.js
git commit -m "add main.js file"
git checkout main
git pull < 10:20am
git checkout my_feature_X_branch
git rebase main
git push
("create a new pull request")
(Zan accepts!)
git checkout main
git pull
C
Y| B
| A
> Y
Z
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment