This should be easy but I haven't figured out a solution yet. I have a repository (repo), agentscript. It has not only the core code and "plugins" but docs, models, and js/min.js files which require hosting .. i.e. something that can "serve" these html/js files.
GHPages, the github project hosting service provides this. GHPages works by having a branch, gh-pages, which is stored on their hosting service (not their project site) But to use their hosting service and nifty templates, there are several, 5, extra files/folders generated and live in the branch I'd like to maintain the branch separately, with the 5 extra files/folders, and periodically add all of the main/master repo to this. I believe the branches would have to remain separate, even tho sharing most of their files. Git merge won't work, I think. If I merge the master into the branch, the branch becomes the master, and I no longer have separation between the two .. and I pollute the master repo with the extra web service files. Is there a git trick that would let me maintain two separate branches, and periodically "merge" the master files into the branch, yet keep the 5 branch web service files/folders out of the master? Oh, in addition, the server files need no updating at all after their initial creation. They simply use the project README.md for their "content". -- Owen
============================================================ FRIAM Applied Complexity Group listserv Meets Fridays 9a-11:30 at cafe at St. John's College to unsubscribe http://redfish.com/mailman/listinfo/friam_redfish.com
