Use GIT to pull in from the master (or develop) branch. Resolve any conflicts you may have from files you've changed in your application folder (headers, footers, layouts, etc). Then run the fuel/install/upgrades/fuel_1.3_schema.sql change. https://github.com/daylightstudio/FUEL-CMS.git
Hey, I was wondering how to upgrade from 1.1 to 1.3 myself. The thing is I have not used git since the beginning of the project, and just recently set up a repository to which I simply added my project directory. Meaning there was no interaction with the FUEL-CMS repo yet.
I'm just curious whether this is a good way of making my FuelCMS up to date: Branch off, delete everything from the project directory, clone FUEL-CMS, merge the master branch into this feature branch, resolve conflicts and merge the branch back to master.
Comments
https://github.com/daylightstudio/FUEL-CMS.git
I'd do this in a branch to be safe.
I'm just curious whether this is a good way of making my FuelCMS up to date:
Branch off, delete everything from the project directory, clone FUEL-CMS, merge the master branch into this feature branch, resolve conflicts and merge the branch back to master.
If not, what would be the best way?