My rebasing help

gistfile1.txt

- ensure latest of master (or rebase source)
- (in dest branch) git rebase -i master
- follow direction, don't forget you need to `git add` changed files
    - if there is a conflict
      - you can fix it manually
      - or if you want to just use HEAD: `git checkout HEAD -- path/to/file.js`
- git push -f origin {branch-name}