Fetch and rebase changes from remote

fetch-rebase-changes.md

Jack and Jill are working on a feature together. Jack has pushed to the feature branch on github. Before Jill pushes her changes, she needs to fetch and rebase her changes over Jack's.

git fetch
git rebase //replay Jill's commits over Jack's
gss  (list files with conflicts)
>> go to atom and fix the conflicts
git add <file-with-conflicts.js> or git add .
git rebase --continue (continue with rebase)
gss (check there are no conflicts)
git push