OR
I'd let distribution shipped in file go to the version control and have
application specific data configs in a include file (included from the main
settings file) for example in drupal settings go to settings.php. I'll do a
include_once('./local_settings.php') at bottom and give my db configurations
in that local settings file.Dipen Chaudhary http://www.dipenchaudhary.com http://playdrupal.com On Wed, Feb 18, 2009 at 4:16 AM, Tekkub <[email protected]> wrote: > If it were me, I would remove those files from tracking and add them to > .gitignore. Then manually install the database.yml and deploy.rb files for > each server by hand. As for themes, I'd put each one in it's own repo and > set up your deploy script for each server to pull in the appropriate one. > That might not even need separate repos for each theme, but instead just > branches in the same repo. Doing it all in one repo is just setting > yourself up for big issues with merges, especially if these files don't > change much. > Tekkub > GitHub General Support > http://support.github.com/ > Join us on IRC: #github on freenode.net > Discussion group: [email protected] > > > On Tue, Feb 17, 2009 at 3:30 PM, Luigi Montanez > <[email protected]>wrote: > >> >> So I have a one app that lives in the wild as multiple instances >> (instance1, instance2, and so on). Between each instance, only a few >> source controlled files will ever be different: >> >> config/database.yml >> config/deploy.rb >> app/themes/* (a custom themes folder consisting of subfolders >> containing images, css, layouts) >> >> Ideally, I'd like all these instances to live in the same repo, and >> accessible locally via a simple "git branch instance1", so that I can >> run the app in development and update the themes as needed. I've >> created branches straight off of master, and that has worked somewhat >> well until today, when merge conflict hell was wrought upon me after >> some vendored gems and the vendored Rails Edge had significantly >> changed. >> >> Is there a way to tell git upon merge: "Always ignore these certain >> files and folders during a merge, and overwrite everything else"? >> >> Thanks, >> Luigi >> >> >> > > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" 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/github?hl=en -~----------~----~----~----~------~----~------~--~---
