Git Etiquette - 071921-LTI/Project3-Docs GitHub Wiki

Starting development

Clone into your desired branch. Run "git fetch" to retrieve the dev branch, and checkout into the dev branch. Run a "git pull" to make sure you are up to date. Then you can branch off of the dev branch to begin development.

Etiquette

Always make sure to "git pull" the dev branch before beginning any development. Branch off of ONLY the dev branch. When you are done working on a feature push your code and create a pull request ONLY to the dev branch. Merges to main will be a group effort when there is a stable dev. Try to merge your code at least once a day to ensure minimal merge conflicts. When your pull request is approved, the branch will be deleted, so make sure to pull the dev branch again and branch off again to ensure you are working with the most up to date code.