gistfile1.txt

Slants-Mac [ ~/Projects/current/idw/idw-portal ] git reset --hard
HEAD is now at 04fca40... Accept CCF

Slants-Mac [ ~/Projects/current/idw/idw-portal ] git pull
Updating 04fca40..2a01c75
fatal: Untracked working tree file 'app/views/customers/_phone_number.rhtml' would be overwritten by merge.

Slants-Mac [ ~/Projects/current/idw/idw-portal ] git status
# On branch ryan-campaigns
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	app/views/customers/_phone_number.rhtml
#	app/views/customers/document_templates/
#	app/views/registrations/no_email_stop.rhtml
#	app/views/utility_mailer/no_campaign_for_marketing_code_error.rhtml
#	db/migrate/016_idwccf_to_version_88.rb
#	db/migrate/017_idwccf_to_version_89.rb
#	db/migrate/018_idwccf_to_version_90.rb
#	db/migrate/019_idwccf_to_version_91.rb
#	db/migrate/020_idwccf_to_version_92.rb
#	db/migrate/021_idwccf_to_version_93.rb
#	db/migrate/022_idwccf_to_version_96.rb
#	db/migrate/023_idwccf_to_version_97.rb
#	doc/
#	vendor/plugins/acts_as_renderer/
nothing added to commit but untracked files present (use "git add" to track)