I have an app running 3.4 until yesterday, now running the latest 3.5 version. I want to upgrade to the latest 3.6 but I get a lot of deprecated warnings. Wanting to fix them in my code, I discovered, that most of the issues arise from the used cakephp-app skeleton used when creating the project.
What is the best way to merge the changes from an older cakephp-app skeleton to the latest?
By hand or diffing is tedious. Is there any way to merge?