For Reference Here are the steps I am taking:
1. Create New Git Repo
2. Copy Current FuelCMS 1.3.2 installation files to that repo & Commit.
3. Create new branch (fuelupdate)
4. Link remote FuelCMS 1.4 master branch to fuelupdate branch (1.3.2)
…
I have modified maybe 10 files of the actual foundation of FuelCMS. These conflicts are conflicts within your code - Is there not a better way to upgrade??