Feature Branches

Feature branches provide a way to test and implement new features without disrupting with the main branch.

Create your new branch
- git checkout -b <branchName>
Commit and push your code changes to that branch
Continue to update your main/master branch as you progress
- git checkout master
- git pull
If any changes have occured to the master branch, merge these changes into your feature branch
- git checkout <branchName>
- git merge master
Deal with any merge conflicts at this time
Continue these steps until the feature is brought to completion

!!Warning!!

DO NOT use -f or --force with commands: PUSH, PULL, FETCH

Pull Requests

When a branch is ready to be merged into the master branch, open a pull request on GitHub to alert others that it is ready and requires review

Open your GitHub repository and click on the branches button
Locate the branch you wish to merge to master and click New pull request
Write the changes you made and click Create pull request
When sufficient review has occured, click Merge pull request to merge it into the master branch