A question about how to manage branches for my blog

How_to_do_this.md

Hi g(uy|irl)s!

This is my blog source code: https://github.com/agonzalezro/agonzalezro.github.com

I have a Makefile (https://github.com/agonzalezro/agonzalezro.github.com/blob/master/Makefile) that:

1. delete all the old generated html and folders
2. it will avoid the deletion of my blog source code: _source, _content, Makefile, etc...
3. it will generate the blog again
4. push to master

I was trying to create a gh-pages branches like in other github project to store there the html generated code. But it doesn't seem to work in the same way that other GH projects.

My question is, how can I have a clean source and a clean generated files?

I was thinking on perhaps have a branch source where I have my pelican source code, and then use master only for the HTML generated documentation.

Any idea?

I found that problem too, my solution: https://github.com/juanriaza/website

@hvdklauw 2 repos is a little bit of overhead in my opinion

@juanriaza, how have you made that? If I create a gh-pages branch and I add there a .html doesn't show the content of the gh-pages branches. Could it be because I continue having htmls on master? I would give it a try because this is what I wanted to do, but didn't seem to work.

@juanriaza, it doesn't seem to work for you neither: http://juanriaza.github.io/

My idea is to use http://agonzalezro.github.io

I will give a try to create a source branch and use master for the htmls... it's a little bit crappy, but well... it seems the only available option.

Have you already reviewed the docs on this topic?

Hey @justinmayer, thanks for your reply.

I was checking it but I didn't try it TBH, why? Because I think that is not exactly what I am looking for, I will explain:

With the solution on the documentation you will have a local gh-pages with the content of the output folder & a local master branch with all your code (with output there too (or not, if you remove it or you gitignore it)).

Something like this:

[master]
  content/
    fantastic_article.rst    
  output/
    fantastic_article.html
    index.html
  themes/
    ...
  pelicanconf.py
  foo
  bar

[gh-pages]
  index.html
  fantastic_article.html

When you push it from local gh-pages to master server side you will have this (in the github repo):

[master]
  content/
    fantastic_article.rst    
  output/
    fantastic_article.html
    index.html
  themes/
    ...
  pelicanconf.py
  foo
  bar
  index.html
  fantastic_article.html

(Check that the .htmls are on the / of master).

Please, fix me if I am wrong. But the next time that you clone your repo you will have the "mess" locally.

In the other hand, what I think that I would do is have 2 branches locally and server. One called pelican where I will have configuration, contents, themes... and I will usually work on it. Then I will try to create a small script to compile the pages to the master branch instead to the pelican branch.

Thanks again for your interest.