-
Notifications
You must be signed in to change notification settings - Fork 590
Conversation
@philipashlock, @haleyvandyck, @rebeccawilliams - I'm good with our going ahead with all this. You? |
👍 |
@philipashlock - game to confirm whether we should merge this? |
Conflicts: _config.yml _includes/header.html implementation-guide.md policy-docs.md schema.md
I just updated my PR to deal with merge conflicts so that it's merge-ready. It looks like most of them are because my editor strips out trailing whitespace, which conflicted with others' future edits to those paragraphs. |
Conflicts: _config.yml schema.md
I've updated my PR and fixed merge conflicts. It may be easiest to review my PR by looking at it with whitespace stripping removed: https://github.com/project-open-data/project-open-data.github.io/pull/373/files?w=1 |
So..... funny story. There are merge conflicts again. We're all currently within 30 feet of each other. Want to get in the same place and finally see this one out? |
Conflicts: licenses.md
OK, I resolved the merge conflict. It required me to remove the line below this one, since How about a merge? 😺 |
Oh, and this is the best diff URL to review my changes: https://github.com/project-open-data/project-open-data.github.io/pull/373/files?w=1 It omits changes that are only whitespace, leaving only the substantive changes in this PR. |
Great - thanks a bunch and sorry for the hassle. I'm going to go ahead and merge. |
Finishes the process #216 started, to update the site to point to the new URL.
_config.yml
to change the site URL to behttps://project-open-data.cio.gov
rel=canonical
link tag to point search engines et al tohttps://project-open-data.cio.gov/
A repo administrator still needs to update the URL visible at the top of the repo page to point to
https://project-open-data.cio.gov/
.