I have some errors when I apply the patch. Take a look at this:
Applying: Signed-off-by: Darryl L. Pierce <mcpierce@gmail.com>
error: patch failed: app/controllers/task_controller.rb:1
error: app/controllers/task_controller.rb: patch does not apply
error: patch failed: app/helpers/application_helper.rb:102
error: app/helpers/application_helper.rb: patch does not apply
error: patch failed: app/models/task.rb:1
error: app/models/task.rb: patch does not apply
error: patch failed: app/views/task/_edit.html.erb:1
error: app/views/task/_edit.html.erb: patch does not apply
error: patch failed: test/functional/task_controller_test.rb:1
error: test/functional/task_controller_test.rb: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Maybe we have conflict versions ?
--
Benjamin LAN-SUN-LUK
Le 29/10/08 06:10, « Darryl L. Pierce » <mcpierce@gmail.com> a écrit :
_______________________________________________
projxp-devel mailing list
projxp-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/projxp-devel