baseurl: Resolve Conflict with Upstream (hacknightlbc/hacknightlbc.github.io)

[mdrmike]

There is an ongoing baseurl conflict with upstream introduced by the commit that fixed hosting Uncoded's fork (this repo), but breaks upstream hosting.

I can think of a couple solutions... but there's probably others.

1. Move upstream repo to a subfolder of the same name. (I think this will introduce other issues, such as hosting from a TLD).
2. Remove/migrate/cherry-pick the commit that adds a baseurl and move it to a separate branch for uncoded hosting. (It would then require changing publishing settings for Github pages.
3. Hmm, there was another I thought of when discussing with @arthursucks and @Philosophist at Techworking ... but escapes me at the moment.

[poproar]

the issue number needs to directly follow the keyword closes in the commit
like so: "closes #6" https://help.github.com/articles/closing-issues-using-keywords/

[mdrmike]

I think this only resolves part of the problem -- a shared codebase between this repo and upstream.

However, the change now breaks hosting of this repo. To fix that, I'd suggest

• adding a branch named gh-pages
• a commit to branch gh-pages to add baseurl (enables hosting for this repo).
• change publishing settings for Github pages

Creates Workflow: with new commits on master, the gh-pages branch will need to be rebased on top of new changes on master

[poproar]

ooh rebase. I have had trouble doing rebase in the past.
What is weird is that the hosting of this repo does not seem to be broken. I did a new post and it shows up. @mdrmike do you think it is using the last working config.yml

I thought that the settings would need to be changed to the gh-pages branch too but ... ¯_(ツ)_/¯

and to note: 🤷‍♂️ or 🤷‍♀️ not sure why GH has a gender based shrug?

[mdrmike]

What is weird is that the hosting of this repo does not seem to be broken.

Ya, this repo is publishing fine.

Apparently a problem merging upstream? I'm not sure what @arthursucks is running into??? 😿 I'm not a total git guru ... but still might be able to help if I could see errors. 🐛

Also, @poproar although I see the gh-pages branch in the repo, master branch (without the baseurl set) is being used to publish. So I'm not sure the other branch (or rebasing) will be needed. Hmm? idk. Keep an eye on it, maybe?