toumorokoshi/sprinter — pull request #58 by staylor32 (2014-06-10 19:19:48+00:00)
Title: Update git formula to not merge automatically

changed git pull to git fetch and then git merge --ff-only.

unit tests and nosetests pass.

I tested change when running sprinter update when no git changes are detected, when upstream branch has changed, and when merge conflict occurs. When merge conflict is detected, git merge does not commit the change and logs an error.