search

siteslab / cwcon2015stage

This is a staging site for cwcon2015
GNU General Public License v2.0
0 stars 0 forks source link

please verify that Ash's github cleanup was done properly #1

Open knowledges33ker opened 10 years ago

knowledges33ker commented 10 years ago

I updated this repository to remove the modules that we've uninstalled for 2015. Chris (@illmasterc), can you please check to make sure that I did this correctly? If so, I'll do this for the 2015 live site repo but I want to double-check that I'm on the right track before I do it there as well.

chrisarusso commented 10 years ago

It looks to me you correctly removed: calendar conference_schedule conference_video easy_social field_collection live_css location max_length multiselect multiple_selects panels print registration registration_views socialmedia twitter

I've noticed that mutliselect is still there, though. So maybe you've upgraded and you're still using it?

In addition you've removed themes and it appears some sql files. The commit doesn't mention that, but that's getting a bit tedious

knowledges33ker commented 10 years ago

Ok, great. Thanks for checking. Yes, we are still using multiselect, just a newer version. And yes, also cleaned up some themes and other cruft so my commit message probably isn't as detailed as it should be but I'm getting there ;-)

knowledges33ker commented 10 years ago

I just updated drupal core on the 2015 staging site to 7.28. Everything looks good to me and I committed this change then pushed it up to github. The staging site for 2015 is in good shape. Is the easiest way to port these changes over to the live site (the git way) to ssh in to cwcon/2015 and then use git clone to grab the files from the 2015stage repo and clone them into the live 2015 repo? or is there a better git way to do it?

chrisarusso commented 10 years ago

In short, you should really have one repository for all of these drupal sites, and just have different branches handling each copy. Then you could merge changes from 2015-stage branch onto 2015-live branch when you're ready and that history would be known in both systems. Issue tracking could be done with milestones and labels and such, and would also keep all history in each. Let's meet/phone about this post-conference when there's more time

knowledges33ker commented 10 years ago

OK, that sounds good.

knowledges33ker commented 10 years ago

Since there's nothing pressing at the moment for the 2014 site, if you have time left over after updating issue #115 on the profile/distro, maybe you could use some of the remaining time we've booked write out some basic instructions for a workflow. We could try to follow them, then during the phone/skype we could review and talk about places where we got stuck. Would that work?

knowledges33ker commented 10 years ago

Chris, did you have any time left from the hours we booked to work on this?

chrisarusso commented 10 years ago

@knowledges33ker, this will probably be best to pick up when I return. However, after reviewing a few different articles, I think you'll find this one most useful to get the concept: https://guides.github.com/introduction/flow/index.html

It's a nice workflow, and a nice visual.

But we can do fancy retroactive things with git, so just keep recording your history as you move along on the cwcon 2015 site and we'll get caught up when I get back.