- Check out develop (if not already):
git checkout develop
- Pull the newest version of develop:
git remote update && git pull
- Start a local feature branch:
git branch <new-feature>
- Checkout this new feature branch:
git checkout <new-feature>
-
Add/delete/edit files.
-
Stage modifications for commit:
git add <files>
- Check status of files staged for commit:
git status
- Commit changes:
git commit -m "meaningful description of changes"
-
Make more changes and repeat process of committing.
-
When ready to merge your branch, push your feature branch to origin for review:
git checkout develop
git push origin <feature-branch>
-
Make a pull request on github.com and add reviewers appropriately.
-
When branch has been reviewed and merged, delete the branch in origin.
-
Delete old feature branch locally (unless you want to keep it around as a sandbox
git branch -D <feature-branch>