Closed jaredmorgs closed 9 years ago
@jaredmorgs, can you rebase against the current master? A lot of these additions already exist.
Looks like you squashed the commits, but you need to move the commit to be based on the current asciidoctor/master branch. Try this:
git remote add asciidoctor git@github.com:asciidoctor/jekyll-asciidoc-quickstart.git
git checkout master
git pull asciidoctor master
git checkout asciidoc-docsite
git rebase master
Resolve conflicts, and force push asciidoc-docsite back to github.
Sorry, I've had a busy week and haven't had a chance to fix this up. I'll get onto it next week.
Ping
Sorry mate. It was nuts before I went on leave. I'm on leave now so should be able to look at this again.
Hey John
Finally had an excuse to get out hte laptop on my holiday ;)
I get to the third step and hit a roadblock.
git remote add asciidoctor git@github.com: asciidoctor/jekyll-asciidoc-quickstart.git git checkout master git pull asciidoctor master <======= git checkout asciidoc-docsite git rebase master
I get the following message:
Permission denied (publickey). fatal: Could not read from remote repository.
Please make sure you have the correct access rights and the repository exists.
Is there a permissions issue for the repo I'm not getting?
On Sun, 15 Mar 2015 at 08:43 Jared Morgan jaredleonmorgan@gmail.com wrote:
Sorry mate. It was nuts before I went on leave. I'm on leave now so should be able to look at this again.
On Sun, Mar 15, 2015, 02:39 John Ericksen notifications@github.com wrote:
Ping
— Reply to this email directly or view it on GitHub https://github.com/asciidoctor/jekyll-asciidoc-quickstart/pull/11#issuecomment-80565829 .
That's strange, you shouldn't need permissions to pull from a public repository.
Maybe I forgot to mention this but I already merged these changes into the master branch. I'll go ahead and close this PR.
@johncarl81 and I have been collaborating on a way to leverage the JAQ as a single document docs hosting solution now that HubPress is kind of dominating the AsciiDoctor blogging scene. Results are on demo at http://jaredmorgs.github.io/Pinball_Arcade_Users_Guide_Android/
What we've added is:
You store the asciidoc files in the directory root at the moment, but I don't see any reason why you couldn't store them in a subfolder for neatness.
Let me know what you think.
After this has been merged, I think we can begin looking at ways to create a TOC for multiple books.