Git Workflow

Part #1a

1. graasp new;
2. Follow directions in prompt;
3. Change (cd) to directory that was created;
4. Create repo in GitHub with same name as directory;
5. Add URL of repository to local repo: git remote add origin <url>;
6. git push –u origin master.

Part #1b

1. Create develop branch:

gco –b develop
git push –u origin develop

Part #2

1. Create issue;
2. Branch from develop to issue feature branch: gco –b #/<issue>-<desc>;
3. Make changes;
4. Commit using conventional format, e.g.,

feat: my new feature
Add something new
closes#3

5. Push to feature branch: git push –u origin 3/update-readme.
6. Repeat 3-5 as necessary.
7. Create pull request (PR) from feature branch to develop;
8. Request review;
9. Merge PR to develop;
10. Delete branch remotely;
11. Checkout develop and update:

gco develop
git pull origin develop

12. Delete local feature branch, e.g., git branch –d 3/update-readme.
13. Repeat 1-11 as necessary.
14. Create PR to master from develop;
15. Request review;
16. Merge PR to master;
17. Checkout master and update:

gco master
git pull origin master

18. If first release, run yarn release --first-release, otherwise just yarn release.
19. Follow instructions to push tag: git push –follow-tags origin master;
20. Checkout develop: gco develop;
21. Merge master: git merge master;
22. Update develop remotely: git push origin develop.
23. Repeat 1-21 as necessary.