Step One Preparing For The Merge
- Run
git status
to determine a couple of things:- If the working tree is clean. If not, either commit your changes, make a new branch and commit them there, or stash them.
- If you are on the correct branch (your feature branch). If not, run
git checkout your-feature-branch
- If your branch is up to date with the remote. If you are not up to date, run
git pull
to get the latest changes.
- Checkout the
dev
branch by runninggit checkout dev
git pull
git checkout your-feature-branch
git merge dev