Problem syncing when there is a merge error

[jdigger]

git sync

Fetching the latest changes from the server
  force updated: theta-6225-confirmationMock (9fda90f...c982d42)
There have been changes on this remote branch, so will merge them in.
Merging theta-6225-confirmationMock with origin/theta-6225-confirmationMock
/Library/Ruby/Gems/1.8/gems/git-process-1.1.4/lib/git-process/git_merge_error.rb:21:in `initialize': undefined local variable or method `error_builder' for #<GitProc::MergeError: GitProc::MergeError> (NameError)
from /Library/Ruby/Gems/1.8/gems/git-process-1.1.4/lib/git-process/git_process.rb:166:in `new'
from /Library/Ruby/Gems/1.8/gems/git-process-1.1.4/lib/git-process/git_process.rb:166:in `proc_merge'
from /Library/Ruby/Gems/1.8/gems/git-process-1.1.4/lib/git-process/sync.rb:76:in `runner'
from /Library/Ruby/Gems/1.8/gems/git-process-1.1.4/lib/git-process/git_process.rb:38:in `run'
from /Library/Ruby/Gems/1.8/gems/git-process-1.1.4/bin/git-sync:73
from /usr/bin/git-sync:19:in `load'
from /usr/bin/git-sync:19