git-pulls ignores pull errors

[pfuntner]

I noticed some behavior today with git-pulls:

1. I had pushed some changes to the toys repo from machine 1
2. I used git-pulls from machine 2
3. I observed that the tool seemed to pull updates for the toys repo the new text was not what I expected
4. I used git-pulls again from machine 2
5. The behavior was the same - the new text was idewntical
6. Did manually did git pull from my local toys repo on machine 2:

   $ git pull
   Updating 29b8e11..abcf86c
   error: Your local changes to the following files would be overwritten by merge:
           bin/pygrep
   Please commit your changes or stash them before you merge.
   Aborting
   $ git diff
   diff --git a/bin/pygrep b/bin/pygrep
   index 0e4c795..67a1d94 100755
   --- a/bin/pygrep
   +++ b/bin/pygrep
   @@ -1,4 +1,4 @@
   -#! /usr/bin/env python2
   +#! /usr/bin/env python3
   
    import re
    import sys
   $
   

7. I realized I had already made the change to the script in the master branch so I reverted the change in the local repo.
8. git-pulls worked correctly

I think the tool needs to sense when the git pull fails.