I would use GIT and pull from the master branch and resolve any conflicts that may happen in your application folder files. Normally when we start projects we pull from the master branch: https://github.com/daylightstudio/FUEL-CMS.git
There will also be a couple minor SQL updates in the fuel/install/updates folder to run.
Comments
https://github.com/daylightstudio/FUEL-CMS.git
There will also be a couple minor SQL updates in the fuel/install/updates folder to run.