search

milesj / forum

[Deprecated] A CakePHP plugin for forum / bulletin board systems.
MIT License
131 stars 57 forks source link

Cake2.0 #18

Closed ceeram closed 12 years ago

ceeram commented 12 years ago

Update for CakePHP 2.x

milesj commented 12 years ago

When I try and do the merge, a ton of files are "deleted". Looks like it's not merging them correctly and losing them all together :/

milesj commented 12 years ago

I couldn't get the merge working so I ran the upgrade shell myself. I went through you commits one by one and copied most of it however, thanks for the help!

ceeram commented 12 years ago

sorry to hear the pull request didnt work out for you, the diff shows indeed some deleted files, but those files were added in the new location, I dont know why it didnt recognize these as moved files as it did for most moved files.

milesj commented 12 years ago

Yeah it was being really weird. I even tried git adding some of the deleted ones, or reverting them, but it was throwing some weird errors I have never received before.