Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Intro docs #233

Merged
merged 5 commits into from
Feb 8, 2017
Merged

Intro docs #233

merged 5 commits into from
Feb 8, 2017

Conversation

verythorough
Copy link
Contributor

- Summary

Adds Intro/Core Concepts and Quick Start documentation as discussed. Storing in docs for now.

- Test plan

Displays as expected in GitHub :P

- Description for the changelog

Add Intro/Core Concepts and Quick Start documentation

- A picture of a cute animal (not mandatory but encouraged)

petskate

Copy link

@cassiozen cassiozen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome docs @verythorough! I think it's very didactical and well written. I only made a few comments regarding the Editorial Workflow.


### Editorial Workflow

Netlify CMS has an optional [editorial workflow](https://github.com/netlify/netlify-cms/blob/master/docs/editorial_workflow.md) that translates common Git commands into familiar language in a simple UI:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this section, this is not exactly how the Editorial Workflow currently works. Currently, it creates a branch, pushes a commit AND opens the PR all at the same time. Changing the status (draft, waiting for review, ready to publish) triggers no GIT actions.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I like the way you described more, though. Maybe in a future version of the CMS, hehe)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, so it does! Apparently when I was testing, I didn't look for the PR until I was expecting to find it. 😛 I'll update.

docs/intro.md Outdated
Mark draft as Waiting for Review | Opens a pull request
Approve and publish draft | Merges pull request and deletes branch

If you prefer to use Git, you can push additional commits and open and merge PRs directly, and the Netlify CMS interface will update to match.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CMS interface will update if the user commits new content, but it wont update for new PRs.
What happens is: Behind the scenes, the CMS creates a metadata branch on the repository, invisible to the end-user. When the CMS creates a new PR, it also saves all data related to this PR in it's metadata branch - which means that PRs created outside the CMS will be ignored by it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this only made sense when I thought draft saving didn't create a PR. Rather than get into the details, I'm now thinking I'll just remove the line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the table and removed the line after. Now it feels kind of abrupt, but probably ok. Heading to a meeting. Will update the branch if I change my mind after. :)

@cassiozen cassiozen merged commit ccd9e0a into decaporg:master Feb 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants