Don't treat git pull failure as fatal.
Merge branches 'git-activity' and 'master'