Macintosh:website efrendiaz$ git pull
remote: Counting objects: 24, done.
remote: Compressing objects: 100% (14/14), done.
remote: Total 15 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (15/15), done.
From git@git.sonianarchive.com:website/efren
   3b60168..0cc32a9  master     -> origin/master
.gitignore: needs update
app/controllers/customer/services/collectors_controller.rb: needs update
app/controllers/search/activities_controller.rb: needs update
app/controllers/search/comments_controller.rb: needs update
app/controllers/search/results/comments_controller.rb: needs update
app/controllers/search/results/results_controller.rb: needs update
app/controllers/search/searches_controller.rb: needs update
app/controllers/search/tags_controller.rb: needs update
app/models/comment.rb: needs update
app/views/search/results/comments/_edit.html.erb: needs update
app/views/search/results/comments/_new.html.erb: needs update
config/deploy.rb: needs update
script/spec_server: needs update
spec/controllers/search/comments_controller_spec.rb: needs update
spec/controllers/search/results/comments_controller_spec.rb: needs update
spec/controllers/search/results/results_controller_spec.rb: needs update
spec/controllers/search/tags_controller_spec.rb: needs update
spec/models/groupwise_import_template_spec.rb: needs update
spec/models/search_result_spec.rb: needs update
spec/models/search_spec.rb: needs update
spec/spec.opts: needs update
spec/spec_helper.rb: needs update
fatal: Entry '.gitignore' not uptodate. Cannot merge.
Merge with strategy recursive failed.
Macintosh:website efrendiaz$