GitHub Hosting with Hugo -- git issues

support
1

Hi,

I have been trying to set up a website powered by Hugo but hosted by GitHub pages, but I’m afraid the tutorial has been less than helpful. It is mostly related to git issues, I’m afraid my knowledge of git is limited, mostly, to how to use it for simple things like committing local changes, cloning and checking out source code from other people’s repos, etc. I am also new to Hugo. My config file is a toml file (i.e., config.toml) as opposed to yaml used in the tutorial, is that relevant as far as hosting with GitHub pages? In the tutorial I would usually manage to make it up to running

git commit -m "INIT..."

before I would receive an error like:

U	public/about/index.html
U	public/css/hyde.css
U	public/css/poole.css
U	public/favicon.png
U	public/fedora/index.html
U	public/index.html
U	public/index.xml
U	public/sitemap.xml
error: commit is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

which I haven’t the foggiest how to solve.

Thanks for your time,
Brenton

2

You’re really going to need to get to grips with Git to solve your problems here, that error doesn’t have anything to do with Hugo. Going into more depth is outside the scope of Hugo or this forum but there are plenty of resources out there with which to learn, not least the Pro Git book:

https://git-scm.com/book/en/v2

There are also hundreds of videos on YouTube explaining all aspects of Git.

If you really can’t get to grips with the command line version then there are good GUI clients available. I personally like Smart Git and it’s free for personal use.

3

Second @JoshArcher’s suggestions on the Pro Git book and Smart Git client.

In my case I use a gitignore file to exclude my public folder, and commit the rest to my github repo. Then I use rsync to push the public folder up to my web server.

I am not sure how it all works with GitHub pages, though.

4

So a couple of days ago I was in Barnes & Noble - I was perusing the tech section, and eyeing a book on golang - random dude walks over, thinks I’m looking at the git books right next to golang, recommends the Pro Git book to me. LOL Tells me where to get it and save a lot of money. Should have paid more attention!