#Git Workflow for Teams
- Check out a branch that is named for the feature name + initials
- Write your code, including adding tests
- Run all the tests
- Add/stash and commit all your changes (NOTE: use
<git add --patch>
&<git checkout --patch>
, and not<git add.>
) <git co master>
<git pull origin master>
<git co [branch]>
<git merge master>
- Resolve any merge conflicts by going to the file, discuss with human...
- Run all of the tests again
<git push origin [branch]>
- Make a pull request
- Flag dev-ops to review the pull request before/after the next standup
- Before working during each work period, pull origin master and merge with branch