Created
April 22, 2009 21:53
-
-
Save robesris/100119 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
First, rewinding head to replay your work on top of it... | |
Applying Began setting up request_access feature to use email-spec | |
Applying Began setting up request_access feature to use email-spec | |
error: patch failed: app/models/access_request.rb:5 | |
error: app/models/access_request.rb: patch does not apply | |
error: app/views/user_mailer/request.html.erb: already exists in index | |
error: db/migrate/20090418013058_create_user_mailers.rb: already exists in index | |
error: patch failed: features/request_access.feature:24 | |
error: features/request_access.feature: patch does not apply | |
error: patch failed: features/send_email.feature:3 | |
error: features/send_email.feature: patch does not apply | |
error: patch failed: features/step_definitions/access_steps.rb:1 | |
error: features/step_definitions/access_steps.rb: patch does not apply | |
error: patch failed: features/step_definitions/webrat_steps.rb:3 | |
error: features/step_definitions/webrat_steps.rb: patch does not apply | |
error: spec/fixtures/user_mailers.yml: already exists in index | |
Using index info to reconstruct a base tree... | |
Falling back to patching base and 3-way merge... | |
No changes -- Patch already applied. | |
Applying schema.rb was modified by migration. | |
Applying Got email-spec tests working with Delayed::Job. request_access.feature passing now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment