added merge conflict error to update command
Merge branch 'master' of https://github.com/thegarage/thegarage-gitx into add-resume-feature-to-update-command

# By cgullick (11) and Ryan Sonnek (7)
# Via Ryan Sonnek (3) and cgullick (1)
* 'master' of https://github.com/thegarage/thegarage-gitx:
  remove whitespace
  bump version
  reorg
  Created MergeError Class & modified specs
  bump version
  bump version
  bump version
  Refactor integration command
  removed extra whitespace
  removed map, changed spec description, updated ver
  fixed merge conflicts and added red to error
  removed return true and changed to_a.map to .map
  changed version
  added ask feature for when branch doesn't exist
  fixed merge conflict error message
  changed version to 2.5.0.alpha1
  changed resume option to string and fixed tests
  added in --resume flag to integrate command
added error for updateCommand during integration

Changed error to be different from when the update command is ran
separately and when it is ran from the integrate method.
Changed version to 2.5.1
Merge branch 'add-resume-feature-to-update-command'

* add-resume-feature-to-update-command:
  Changed version to 2.5.1
  added error for updateCommand during integration
  added merge conflict error to update command
Merge branch 'master' into staging

* master:
  Changed version to 2.5.1
  added error for updateCommand during integration
  added merge conflict error to update command