just making sure I get rebasing

git rebase flow

"remote"
 git branch -v
  master

"local"
git branch -v
 * master
   feature-a
   feature-b
 
git checkout feature-a
git add file.md
git commit -m 'made changes'

# put feature-a onto master-tip
git rebase master

# still have to merge eventually right?
git checkout master
git merge feature-a (# up to date with master via rebase)
git push origin master