Symphony.

It’s my understanding that the Symphony repo (http://github.com/symphony/symphony-2/) contains both v2.0.7 (master) and v2.0.8RC1 (integration). I started with a clone of the master branch to install v2.0.7 and was successful. Then I added a 208RC1 branch and pulled (I think) to it from the integration branch to get v2.0.8RC1 and was successful again. But now, for some reason, both of my branches (master and 208RC1) have v2.0.8RC1. That is, I can’t manage to run v2.0.7 now when I checkout my master branch.

Can anyone please tell me what I did wrong and if I can recover without starting over? And how?

Did you create a new branch before pulling from Integration?

git checkout -b integration && git pull origin integration

If you were in the master branch when you pulled, it will have merged the integration branch code into your master branch.

I didn’t keep a record but I think I checked out my integration branch, which I call 208RC1, and then did the pull from origin integration.

If you correctly checked out a new branch before pulling integration, then your master should have the 2.0.7 code. We do it all the time. Switching branches, git checkout master, should cause the code to change. Calling get merge 208RC1 or git pull origin integration from the master branch would cause both branches to have the same code.

Apparently I screwed it up somehow. I started over with a clean clone of origin/master, created a new 208 branch and pulled from origin/integration. Now I have a working version of 207 and 208.

When I ran update.php on the 2008 branch I got an error. It failed trying to drop a non-existent ‘calendar’ field from the sym_fields_date table. But 208 seems to be working.

Thanks for the help.