Skip to content
This repository has been archived by the owner on Sep 24, 2022. It is now read-only.

Move incubator repo into dir in templates repo #189

Merged
merged 140 commits into from
Mar 3, 2021

Conversation

camerons
Copy link
Member

@camerons camerons commented Feb 28, 2021

Purpose / why

This pull requests creates a branch which includes the content (and history) of the incubator repository, as at 2021-02-28. This is a step toward moving templates (and material that can be used to build a template) into the templates repository so it can be developed there.

This interim pull request is to set up a branch which can be referenced by others and save the effort required to do the lift and shift across.

The next pull request will move template content into the template directories.

This pull request partly addresses #188.

What changes were made?

All of the contents of the incubator repository is put into the templates/incubator/ directory.

Verification

Check the contents of templates/incubator is the same (or at least similar) to contents in https://github.com/thegooddocsproject/incubator/

Note: README and LICENSE files didn't get copied into the directory below. (They were duplicated in both.) That's fine, we don't need them for copying templates.


Checklist

Pull-request reviewer should ensure the following

  • Are issues linked correctly?
  • Is this PR labeled correctly?
  • If template updates: do they align with developers.google.com/style/?
  • Did the PR receive at least one 👍 and no 👎 from core-maintainers?
  • On merging, did you complete the merge using keywords?
  • On merging, did you add any applicable notes to a draft release and link to this PR?

Loquacity and others added 30 commits February 28, 2021 12:42
Update capitalization for Google developer's style guide

Co-authored-by: Daniel D. Beck <[email protected]>
Update capitalization for Mailchimp

Co-authored-by: Daniel D. Beck <[email protected]>
Update link text for Atom linter

Co-authored-by: Daniel D. Beck <[email protected]>
Update Microsoft Manual of Style title

Co-authored-by: Daniel D. Beck <[email protected]>
Adds GH action for using tweego to compile twee files and publish to gh-pages
@camerons camerons changed the base branch from master to add-incubator February 28, 2021 04:40
@camerons
Copy link
Member Author

The git commands followed to do the rebase:

This sequence uses a git rebase to re-apply the incubator repository onto the templates repository

git clone https://github.com/camerons/templates.git
cd templates/
git remote add incubator https://github.com/camerons/incubator.git
git fetch incubator

git checkout incubator/master
git checkout -b incubator

Apply incubator repository

git rebase -Xours master

There was one clash that needed sorting

git add base-template/contributors-guide.md
git rebase --continue

Create a branch with the incubator

git checkout branch
git checkout -b add-incubator

git merge incubator

Move the incubator files into their own directory

mkdir incubator
git mv about-communications.md base-template/ dist ia-guide storyformats/ style-guide/ template-communications.md incubator/
git commit -m"Move incubator files into incubator/ dir" .

@camerons camerons changed the title Add incubator Move incubator repo into dir in templates repo Feb 28, 2021
@barbaricyawps
Copy link
Contributor

@camerons , this looks good to me. Will these files go into a specific folder in the templates repo or just all get dumped in the root? No worries either way, but I was just curious.

@camerons
Copy link
Member Author

camerons commented Mar 3, 2021

Thanks barbaricyawps, this copies all incubator files into its own directory, in case we want to access them later.
The related pull request, #190, goes one step further, deletes non-relevant content.

@camerons camerons merged commit ae7d3c4 into thegooddocsproject:add-incubator Mar 3, 2021
@camerons camerons deleted the add-incubator branch July 9, 2021 21:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move incubator templates into the templates/ dir for future development
5 participants