Long, It's mostly working now, thank you, however I have run into a small problem driven I think by my many branches. Perhaps you can give me some advice on how to best manage my branches.
I am making my changes on local copy, and reserving master for pulling down changes when you make them. This means I have two branches on my github account, which are called origin/localcopy and origin/master (when viewed remotely). Master contains your files, whereas localcopy contains my edits. When I pull from Github to my deployment machine, as you previously suggested, it clones the master branch but this doesn't have my changes in it. I see two options: 1. Merge my changes to localcopy back into the Master and then push/ pulling the master to my remote server 2. Getting the remote server to pull down the localcopy branch. The second option seems preferable to me because then I can make sure I don't get problems when adding in the updates, however I don't know how to get my remote server to download the localcopy. I also read in your guides that pushing all my edits onto my local Master copy is best practices, but what happens then if there is a conflict when you update the core project files? An unrelated question, but one I've been pondering, is what happens if you make changes to the database in a update. How do we know that we need to rerun the migrations? Antony --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
