- Update master
git checkout master
- Switch to mastergit fetch --all
- Pull down metadata from all remotesgit merge origin master
- Merge changes from origin master into your current branch
- Create feature branch
git checkout -b [feat/fix]-<Ticket>-<Description>
- Create new branchgit push -u origin <branch name>
- Push branch to remote "origin" and set as upstream
- DEVELOP! (Rinse and Repeat)
- Commit early, commit often - include the ticket # in commit messages
- Fetch & merge changes regularly, and rebase if needed.
- Push at end of the day
- Merge to staging
- (Optional): Create a new staging branch for your staging.
git checkout -b <branch name>-staging
git push -u origin <branch name>-staging
git fetch --all
git rebase -i origin/staging
- Squash your changes
- Merge to master
- DO NOT BASE OFF YOUR STAGING REBASE
git checkout <branch-name>
- Get off your staging rebased branchgit fetch --all
git rebase -i origin/master
- Squash your changes