git checkout -b 'feature-branch-name' gco -b 'feature-branch-name'
gco 'feature-branch-name' gco master
gco master git pull origin master
git add . git commit -m "FEAT: whatever" git push origin 'feature-branch-name'
-
navigate to our github repo
-
click green button; create pull request
-
create your pull requests
-
tag reviewer
-
reviewer will merge into master (if there are no conflicts)
-
if there are conflicts:
-
owner of pull request should
- update their local master
- merge local master into feature branch
- resolve conflicts
- push branch again (add/commit/push)
gco master git merge master
- 15 minutes
- individually: -- What did you do yesterday? -- What are you working on today? -- Do you have any roadblocks?