$ git pull origin staging
remote: Counting objects: 150, done.
remote: Compressing objects: 100% (61/61), done.
remote: Total 117 (delta 45), reused 117 (delta 45)
Receiving objects: 100% (117/117), 27.71 KiB | 38 KiB/s, done.
Resolving deltas: 100% (45/45), completed with 28 local objects.
From ssh://healthspottr.monkeybrains.net:2222/home/git/healthspottr
 * branch            staging    -> FETCH_HEAD
CONFLICT (rename/add): Rename vendor/plugins/attribute_normalizer/MIT-LICENSE->vendor/plugins/refraction/MIT-LICENSE in HEAD. vendor/plugins/refraction/MIT-LICENSE added in 5028cfb004d075b23df02745f86332ac7dcc1c1e
Adding as vendor/plugins/refraction/MIT-LICENSE~5028cfb004d075b23df02745f86332ac7dcc1c1e instead
Auto-merging app/views/layouts/_header.html.haml
Auto-merging config/development.sphinx.conf
CONFLICT (content): Merge conflict in config/development.sphinx.conf
Automatic merge failed; fix conflicts and then commit the result.
szymon@elcamino ~/Sites/hs $ git status
# On branch master
# Your branch is ahead of 'origin/master' by 7 commits.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   .DS_Store
#	new file:   app/controllers/membership/member_sessions_controller.rb
#	new file:   app/controllers/membership/members_controller.rb
#	new file:   app/controllers/membership/topics_controller.rb
#	new file:   app/models/feed_item.rb
#	new file:   app/models/feed_source.rb
#	modified:   app/views/layouts/_header.html.haml
#	new file:   app/views/membership/members/edit.html.haml
#	new file:   app/views/membership/members/new.html.haml
#	new file:   app/views/membership/members/thanks.html.haml
#	new file:   app/views/pages/login.html.haml
#	modified:   config/deploy/staging.rb
#	new file:   db/migrate/20091103221722_create_feed_sources.rb
#	new file:   db/migrate/20091103221755_create_feed_items.rb
#	new file:   db/seeds.rb
#	new file:   lib/great_feeder.rb
#	new file:   lib/great_feeder/great_rss/bartosz_pietrzak_blog.rb
#	new file:   lib/great_feeder/great_rss/base.rb
#	new file:   lib/great_feeder/great_scrape/base.rb
#	new file:   lib/great_feeder/rss_feeds.rb
#	new file:   lib/great_feeder/scrape_feeds.rb
#	modified:   public/500.html
#	new file:   public/images/bulb_bullet.png
#	new file:   public/images/log1.png
#	new file:   public/images/up_arrow.png
#	new file:   public/stylesheets/.application.css.swm
#	modified:   public/stylesheets/jquery.lightbox-0.5.css
#	new file:   test/fixtures/feed_items.yml
#	new file:   test/fixtures/feed_sources.yml
#	new file:   test/unit/feed_item_test.rb
#	new file:   test/unit/feed_source_test.rb
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#	both modified:      config/development.sphinx.conf
#
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	deleted:    log/server.log
#	deleted:    log/test.log
#	deleted:    public/500.thml
#	modified:   public/javascripts/application.js
#	modified:   public/javascripts/tiny_mce/themes/advanced/skins/default/content.css
#	modified:   public/stylesheets/application.css
#	deleted:    tmp/pids/server.pid
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	vendor/plugins/refraction/MIT-LICENSE~5028cfb004d075b23df02745f86332ac7dcc1c1e