forked from github/docs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New translation batch for es (github#26597)
* Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * Run script/i18n/fix-translation-errors.js * Run script/i18n/lint-translation-files.js --check rendering * run script/i18n/reset-files-with-broken-liquid-tags.js --language=es * run script/i18n/reset-known-broken-translation-files.js * Check in es CSV report Co-authored-by: Grace Park <[email protected]>
- Loading branch information
Showing
27 changed files
with
235 additions
and
233 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
61 changes: 0 additions & 61 deletions
61
...orating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue.md
This file was deleted.
Oops, something went wrong.
This file contains 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
72 changes: 72 additions & 0 deletions
72
...rating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md
This file contains 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 |
---|---|---|
@@ -0,0 +1,72 @@ | ||
--- | ||
title: Merging a pull request with a merge queue | ||
intro: 'If a merge queue is required by the branch protection setting for the branch, you can add your pull requests to a merge queue and {% data variables.product.product_name %} will merge the pull requests for you once all required checks have passed.' | ||
versions: | ||
fpt: '*' | ||
ghec: '*' | ||
topics: | ||
- Pull requests | ||
shortTitle: Merge PR with merge queue | ||
redirect_from: | ||
- /pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue | ||
--- | ||
|
||
{% data reusables.pull_requests.merge-queue-beta %} | ||
|
||
## About merge queues | ||
|
||
{% data reusables.pull_requests.merge-queue-overview %} | ||
{% data reusables.pull_requests.merge-queue-references %} | ||
|
||
## Adding a pull request to a merge queue | ||
|
||
{% data reusables.repositories.navigate-to-repo %} | ||
{% data reusables.repositories.sidebar-pr %} | ||
|
||
1. In the "Pull Requests" list, click the pull request you would like to add to a merge queue. | ||
|
||
1. Click **Merge when ready** to add the pull request to the merge queue. Alternatively, if you are an administrator, you can: | ||
- Directly merge the pull request by checking **Merge without waiting for requirements to be met (administrators only)**, if allowed by branch protection settings, and follow the standard flow. ![Fusionar las opciones de la cola](/assets/images/help/pull_requests/merge-queue-options.png) | ||
|
||
{% tip %} | ||
|
||
**Tip:** You can click **Merge when ready** whenever you're ready to merge your proposed changes. {% data variables.product.product_name %} will automatically add the pull request to the merge queue once required approval and status checks conditions are met. | ||
|
||
{% endtip %} | ||
|
||
1. Confirm you want to add the pull request to the merge queue by clicking **Confirm merge when ready**. | ||
|
||
## Removing a pull request from a merge queue | ||
|
||
{% data reusables.repositories.navigate-to-repo %} | ||
{% data reusables.repositories.sidebar-pr %} | ||
|
||
1. In the "Pull Requests" list, click the pull request you would like to remove from a merge queue. | ||
|
||
1. To remove the pull request from the queue, click **Remove from queue**. ![Remove pull request from queue](/assets/images/help/pull_requests/remove-from-queue-button.png) | ||
|
||
Alternatively, you can navigate to the merge queue page for the base branch, click **...** next to the pull request you want to remove, and select **Remove from queue**. For information on how to get to the merge queue page for the base branch, see the section below. | ||
|
||
## Viewing merge queues | ||
|
||
You can view the merge queue for a base branch in various places on {% data variables.product.product_name %}. | ||
|
||
- En la página de **Ramas** del repositorio. We recommend you use this route if you don't have or don't know about a pull request already in a queue, and if you want to see what's in that queue. Para obtener más información, consulta la sección "[Ver las ramas en tu repositorio](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/viewing-branches-in-your-repository)". | ||
|
||
![Ver la cola de fusión en la página de las ramas](/assets/images/help/pull_requests/merge-queue-branches-page.png) | ||
|
||
- On the **Pull requests** page of your repository, click {% octicon "clock" aria-label="The clock symbol" %} next to any pull request in the merge queue. | ||
|
||
![Ver la cola de fusión en la página de solicitudes de cambio](/assets/images/help/pull_requests/clock-icon-in-pull-request-list.png) | ||
|
||
- On the pull request page when merge queue is required for merging, scroll to the bottom of the timeline and click **the merge queue** link. | ||
|
||
![Merge queue link on pull request](/assets/images/help/pull_requests/merge-queue-link.png) | ||
|
||
- La vista de cola de fusión muestra las solicitudes de cambios que están actualmente en cola, con tus solicitudes de cambios marcadas claramente. | ||
|
||
![Vista de cola de fusión](/assets/images/help/pull_requests/merge-queue-view.png) | ||
|
||
## Manejar las solicitudes de cambios eliminadas de la cola de fusión | ||
|
||
{% data reusables.pull_requests.merge-queue-reject %} |
This file contains 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
58 changes: 58 additions & 0 deletions
58
...es-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md
This file contains 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 |
---|---|---|
@@ -0,0 +1,58 @@ | ||
--- | ||
title: Managing a merge queue | ||
intro: You can increase development velocity with a merge queue for pull requests in your repository. | ||
versions: | ||
fpt: '*' | ||
ghec: '*' | ||
permissions: People with admin permissions can manage merge queues for pull requests targeting selected branches of a repository. | ||
topics: | ||
- Repositories | ||
- Pull requests | ||
shortTitle: Managing merge queue | ||
redirect_from: | ||
- /repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue | ||
--- | ||
|
||
{% data reusables.pull_requests.merge-queue-beta %} | ||
|
||
## About merge queues | ||
|
||
{% data reusables.pull_requests.merge-queue-overview %} | ||
|
||
The merge queue creates temporary branches with a special prefix to validate pull request changes. The changes in the pull request are then grouped with the latest version of the `base_branch` as well as changes ahead of it in the queue. {% data variables.product.product_name %} will merge all these changes into `base_branch` once the checks required by the branch protections of `base_branch` pass. | ||
|
||
You may need to update your Continuous Integration (CI) configuration to trigger builds on branch names that begin with the special prefix `gh-readonly-queue/{base_branch}` after the group is created. | ||
|
||
For example, with {% data variables.product.prodname_actions %}, a workflow with the following trigger will run each time a pull request that targets the base branch `main` is queued to merge. | ||
|
||
```yaml | ||
on: | ||
push: | ||
branches: | ||
- gh-readonly-queue/main/** | ||
``` | ||
{% data reusables.pull_requests.merge-queue-merging-method %} | ||
Para obtener más información acerca de los métodos de fusión, consulta "[Acerca de la fusión de solicitudes de extracción](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)." | ||
{% note %} | ||
**Nota:** | ||
* A merge queue cannot be enabled with branch protection rules that use wildcard characters (`*`) in the branch name pattern. | ||
|
||
{% endnote %} | ||
|
||
{% data reusables.pull_requests.merge-queue-reject %} | ||
|
||
## Managing a merge queue | ||
|
||
Repository administrators can require a merge by enabling the branch protection setting "Require merge queue" in the protection rules for the base branch. | ||
|
||
Para obtener más información de cómo habilitar el ajuste de protección de cola de fusión, consulta la sección "[Administrar una regla de protección de rama](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#creating-a-branch-protection-rule)". | ||
|
||
## Leer más | ||
|
||
* "[Merging a pull request with a merge queue](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue)" | ||
* "[Acerca de las ramas protegidas](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches)" |
55 changes: 0 additions & 55 deletions
55
...erges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue.md
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.