Success! You were right, Josh, I got some of the steps reversed and
sometimes forgot which branch I was in. Fixed that with a new bash PS1
that prints out branches when I'm in a git repo.
The long story short is that the main repo is 6 files/dirs lighter than the
gh-pages, much much cleaner.
I recommend Sourcetree for looking at these things more visually. (Google it or
go to atlassian.com). It’s free and works with Git and Mercurial. I use it with
Mercurial.
I think you can do this with a ‘master’ branch, an ‘extras’ branch, and a
‘release’ branch. What you are doing is close to
Owen,
Looks like you have things working just how you want them to. You can keep
working in your master branch and whenever you want to update gh-pages,
git checkout gh-pages
git merge master
done.
So long as you never merge gh-pages into master you are golden.
—joshua
On Dec 4, 2013, at
I thought so too. But here's an experiment.
master dir has this (Attic is in .gitignore and just has stuff removed):
*Home|~/src/cs/test3[649]: ls*
*Attic README.md junk.txt*
while gh-pages has:
*Home|~/src/cs/test3[653]: ls*
*Attic images javascripts stylesheets*
*README.md index.html
This looks to me like at some point gh-pages was merged to master. So that
when you deleted “stylesheets in master, merging to gh-pages also included
this delete action… My guess is that if you added the stylesheets directory
back into gh-pages you wouldn’t ever experience this problem
One last thing:
I use gitx http://gitx.frim.nl/ a simple little OSX app that has a nice
graphical display of your history.
Helps to see where you are, when you have multiple branches in the picture.
—joshua
On Dec 5, 2013, at 6:51 PM, Owen Densmore o...@backspaces.net wrote:
Wow, sounds
Just looked at it, I like it!
BTW:
http://oli.jp/2011/github-pages-workflow/
is a post on gh-pages and various ways to manage it. It in turn was one of
several responses from this:
http://lea.verou.me/
which discussed the mirroring approach.
What I REALLY want is a bit further down the
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
