Git: Rebasing a Branch onto Master

Nov 26, 2018
  1. Checkout your feature branch you want 'merged' into master.
$ git checkout feature
  1. Rebase master onto the feature branch.
$ git rebase master
  1. Then rebase your feature onto the master branch.
$ git checkout master
$ git rebase feature
  1. Check you have the lastest changes from origin, then push
$ git pull
$ git push
Great! You've successfully subscribed.
Great! Next, complete checkout for full access.
Welcome back! You've successfully signed in.
Success! Your account is fully activated, you now have access to all content.