Step One Preparing For The Merge

  1. Run git status to determine a couple of things:
    1. If the working tree is clean. If not, either commit your changes, make a new branch and commit them there, or stash them.
    2. If you are on the correct branch (your feature branch). If not, run git checkout your-feature-branch
    3. 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.
  2. Checkout the dev branch by running
    git checkout dev
git pull
git checkout your-feature-branch
git merge dev