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

docs: consolidate getting started guides (PROJQUAY-2500) #884

Merged
merged 1 commit into from
Oct 28, 2021

Conversation

flavianmissi
Copy link
Contributor

@flavianmissi flavianmissi commented Sep 9, 2021

We have a few different "Getting started" guides, which can confuse a newcomer (it did confuse me x)).
This PR merges a couple guides, and renames another - hopefully stopping any potential confusion.

@app-sre-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@flavianmissi flavianmissi changed the title docs: first draft of consolidated getting started with Quay docs: first draft of consolidated getting started with Quay (PROJQUAY-2500) Sep 13, 2021
@flavianmissi flavianmissi marked this pull request as ready for review September 14, 2021 09:40
@flavianmissi flavianmissi changed the title docs: first draft of consolidated getting started with Quay (PROJQUAY-2500) docs: consolidate getting started with Quay guides (PROJQUAY-2500) Sep 14, 2021
@flavianmissi flavianmissi changed the title docs: consolidate getting started with Quay guides (PROJQUAY-2500) docs: consolidate getting started guides (PROJQUAY-2500) Sep 16, 2021
docs/getting-started.md Outdated Show resolved Hide resolved
also remove previous similar guides, and rename previuous
docs/getting_started.md to docs/quick-local-deployment.md.
@bcaton85 bcaton85 self-requested a review October 28, 2021 12:48
Copy link
Contributor

@bcaton85 bcaton85 left a comment

Choose a reason for hiding this comment

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

LGTM

@flavianmissi flavianmissi merged commit 8f64efd into quay:master Oct 28, 2021
@flavianmissi flavianmissi deleted the getting-started-docs branch October 28, 2021 12:50
@flavianmissi
Copy link
Contributor Author

/cherry-pick redhat-3.6

@openshift-cherrypick-robot

@flavianmissi: #884 failed to apply on top of branch "redhat-3.6":

Applying: docs: consolidate getting started guides (PROJQUAY-2500)
Using index info to reconstruct a base tree...
M	README.md
M	docs/docker-local-dev.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/docker-local-dev.md deleted in docs: consolidate getting started guides (PROJQUAY-2500) and modified in HEAD. Version HEAD of docs/docker-local-dev.md left in tree.
Removing docs/development-container.md
Auto-merging README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 docs: consolidate getting started guides (PROJQUAY-2500)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick redhat-3.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants