On Wed, Oct 29, 2008 at 6:54 AM, LAN-SUN-LUK Benjamin
<Benjamin.LAN-SUN-LUK(a)supinfo.com> wrote:
I have some errors when I apply the patch. Take a look at this:
Applying: Signed-off-by: Darryl L. Pierce <mcpierce(a)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 ?
The patch applies cleanly on both of my development machines. I just
made sure my test branch is on the tip (latest) from master and the
patch applied.
Make sure you've updated master and are applying to an updated branch.
--
Darryl L. Pierce <mcpierce(a)gmail.com>
Visit the Infobahn Offramp: <
http://mcpierce.multiply.com>
"Bury me next to my wife. Nothing too fancy..." - Ulysses S. Grant