Best way to upgrade untracked Jumpstart

I got Jumpstart about six months ago and used a downloaded copy for my project. I built out my project substantially before tracking changes with git. In hindsight, I realize I probably should have integrated with git from the get go. Now, I'd like to see if there is anyway to "upgrade" my Jumpstart code based on the commits that have occurred in the repo since my download. What would be the best way to do this? I am not the best with git (still learning) so I really appreciate any advice on the steps to take.

Hey Isaac,

You should be able to use the same upgrade path as if you used git. The github template creates a new history as well, so it uses the same process.

You might also just want to git diff from 6 months ago and now and just apply those changes manually if your code has diverged a lot.

---

First, we need to add a remote for the Jumpstart Pro repository.

git remote add jumpstart git@github.com:jumpstart-pro/jumpstart-pro.git

To merge updates from Jumpstart Pro's repository, you can merge from the jumpstart origin.

git fetch jumpstart
git merge jumpstart/master --allow-unrelated-histories