Git rebase workflow

git-rebase.markdown

Checkout a new working branch

 git checkout -b <branchname>

Make Changes

 git add
 git commit

Update branch

 git checkout <branchname>
 git rebase origin/develop

Squash Last N Commits Against Develop

 git rebase --interactive origin/develop

Squash Last N Commits Locally Without Pulling In Upstream Changes From Develop

 git rebase -i HEAD~<n>
 or
 git rebase -i <after-this-commit-sha1>

Conflicts

1. Resolve conflict my looking at the files in question.
2. git add
3. git rebase --continue