1. Create the branches
    $git branch one
  2. Change to the branch
    $git checkout one
  3. Merge to the master
    $git checkout master
    $git merge origin/one
    $git push
  4. Switch to your branch
    $git checkout one
  5. Merge master to local
    $git pull origin master:one