In the following, you will see that I am a git newbie who doesn’t know what he’s doing. Sorry for any overly naive questions.
I have a few Github pages already. So far, I have managed them directly on the web site, but would like to try managing them locally and using Jekyll.
When I follow https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/#platform-linux, I reach a roadblock in step 3, “generate Jekyll site files”.
What am I supposed to do between steps 3-6, “connect your remote repository”, and 3-7, “edit the Jekyll template site”? I tried git fetch, which succeeded. How do I now get my files into the working tree? git checkout master complains that it would overwrite .gitignore and _config.yml. git merge origin/master complains that it would overwrite .gitignore. Any suggestions what I should do, or what I should read to continue the process?
This is on Fedora 23, by the way.
Since I think the referenced help page has room for improvement, I would like to comment on it. See also