After successfully running on our demo site for the last few weeks, we've merged the new layout (and photo galleries!) from the edge branch onto master and deployed it out to dogfood.
If you haven't checked out the changes on demo, definitely log back into dogfood and take a look. Because of the significant changes (including a number of new migrations for the galleries), you'll need to take care when pulling in the updates and merging them with any custom code you've developed. The best thing to do is to merge onto a "merge_test" branch. That way you can isolate the work for required for resolving any merge conflicts and other integration work. If you've followed our recommended local repository setup (see http://docs.insoshi.com/Git-Guides) here's what you should do: git checkout master git pull git checkout my_code git checkout -b merge_test git merge master Also, for those of you who want to work against the original layout, I've updated the tag "original_layout" to point to the last commit on master before this merge with edge. You should run git fetch --tags origin (once again assuming you're using our recommended repository setup) to get the updated tag location (commit 9fe47efdd5642220d09772c8bd183195a85b2ce1). Long --~--~---------~--~----~------------~-------~--~----~ Insoshi developer site: http://dogfood.insoshi.com/ Insoshi documentation: http://docs.insoshi.com/ You received this message because you are subscribed to the Google Groups "Insoshi" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/insoshi?hl=en -~----------~----~----~----~------~----~------~--~---
