generated from nginx/template-repository
-
Notifications
You must be signed in to change notification settings - Fork 121
fix: Update closed-contributions.md based on user testing #819
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,11 +18,13 @@ This repository (https://github.com/nginx/documentation) is where we work by def | |
| The process is as follows: | ||
|
|
||
| - Add the closed repository as a remote | ||
| - The closed repository is also known as `internal` | ||
| - Create a remote branch with the prefix `internal/` in the closed repository | ||
| - Open a pull request in the closed repository to get previews and request feedback | ||
| - Once all stakeholders are happy with changes, close the pull request in the closed repository | ||
| - Merge the changes from the remote (Closed) repository branch with a new branch in the open repository | ||
| - Open a new pull request in the open repository, where it can be merged | ||
| - You do not have to get approvals a second time | ||
|
|
||
| You can get the URL through our internal communication channels: it will be represented in the following steps as `<closed-URL>`. | ||
|
|
||
|
|
@@ -36,6 +38,12 @@ git remote add internal [email protected]:<closed-url>.git | |
| git fetch --all | ||
| ``` | ||
|
|
||
| You can verfiy access to the closed repository in your `.git/config` file. Look for the code block that corresponds to: | ||
|
|
||
| ``` | ||
| [remote "internal"] | ||
| ``` | ||
|
|
||
| Check out the remote `main` branch, and use it to create a feature branch. **Ensure that you prefix all branch names with `internal/`** | ||
|
|
||
| ```shell | ||
|
|
@@ -51,7 +59,7 @@ git commit | |
| git push internal | ||
| ``` | ||
|
|
||
| Open a pull request when you are ready to receive feedback from stakeholders. | ||
| Open a pull request when you are ready to receive feedback from stakeholders. You'll see the pull request in the internal repository. | ||
|
|
||
| After any iterative work, close the pull request. Since the closed repository is a mirror of the open one, we do not merge changes to it. | ||
|
|
||
|
|
@@ -64,4 +72,9 @@ git merge internal/internal/feature | |
| git push origin | ||
| ``` | ||
|
|
||
| This allows you to open a _new_ pull request in the open repository. To verify that pull request reflects the changes made in the closed | ||
| repository, check the commit messages. | ||
|
|
||
| If you are a maintainer of https://github.com/nginx/documentation, you can merge the changes without additional approvals. | ||
|
|
||
| Once the content changes have been merged in the open repository, they will synchronize back to the closed repository. | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.