Repo housekeeping

[petecooper]

As a precursor to #212, we need to address the multiple-branch setup of this repo and – ideally – pare it back to a single branch.

For legacy reasons, we used master when the pages were hosted on GitHub Pages. We use self-hosted for the self-hosted docs site which runs atop a bodged Jekyll instance. As #212 outlines, we can save resources & sanity by using a hosted docs service with proper search across all browsers etc.

Mercifully, there isn't a vast amount of difference between the two branches, though a clean PR cannot currently be raised. At the moment, there are around 10 to 20 files that are different across the two branches, so it's not a significant bum ache to pick through and make the changes manually (if necessary).

Proposal:

• decide on the new branch name (main fits the bill and is suitably platform-agnostic)
• decide on branch merge direction
• decide on which current branch is to be renamed
• merge branch diffs
• bin the redundant branch
• update contribution docs

Tagging for feedback: @Bloke @bloatware @philwareham

[petecooper]

Tagging 5525bdd - @Bloke has merged (edit: recent) changes from master to self-hosted so we've ticked off a few points above. Thanks, Stef!

[Bloke]

I've only merged the ones from the last 3 recent commits (as it was easy). But I think the same kind of idea can be applied by diffing the two branches. Not sure how you diff across branches but I think it's possible.

[petecooper]

Not sure how you diff across branches but I think it's possible.

self-hosted...master

[Bloke]

Yes, but using either the double-dot or triple-dot notation reveals a load of changes to configuration files and grunt files and whatnot too. Not sure how much of that is needed to be merged.

> git diff --name-only master..self-hosted
.github/dependabot.yml
CNAME
Gemfile
Gruntfile.js
README.md
_config.yml
_includes/header.html
_layouts/default.html
_layouts/document--without-toc.html
assets/js/search.js
img/themes-delete-obsolete-assets.png
img/themes-menu-selection.png
index2.md
js/lunr.js
js/search.js
package.json
search.json
search/index.html
src/search.js
tags/tag-attributes-cross-reference.md

Actual diff output of the above is attached. No idea if all those changes can be applied or if it'll bork stuff, or if we need to use the triple-dot notation instead to do a deeper dive.

And is that in the right 'direction' to add stuff from master to self-hosted, or does it need to go the other way to merge the self-hosted changes into master/main?

to-merge-diff.txt