The basic flow is this:
- When you want to update a feature branch you're working on, rebase on to it.
- When you're ready to integrate the work you've been doing into the master branch, merge it.
Given the name of your feature branch is registration-page:
- Commit what you've got on your feature branch.
- Checkout master:
git checkout master - Update master:
git pull - Switch back to your feature branch:
git checkout registration-page - Rebase master on top of your feature branch:
git rebase master - Resolve any conflicts that arise (if any).
Optional (if you're ready to merge your work into master & deploy):
- Checkout master:
git checkout master - Merge your feature branch into master:
git merge registration-page - Push to origin:
git push