зеркало из https://github.com/github/docs.git
[2023-03-01]: GitHub Desktop v3.2 (#35102)
Co-authored-by: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com>
This commit is contained in:
Steve Ward
GitHub
Родитель
f06a32f45d
Коммит
7c7a596782
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 129 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 353 KiB |
Двоичные данные
assets/images/help/desktop/mac-create-pull-request.png
Двоичные данные
assets/images/help/desktop/mac-create-pull-request.png
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 92 KiB После Ширина: | Высота: | Размер: 265 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 100 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 31 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 52 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 193 KiB |
|
|
@ -117,6 +117,6 @@ Once you're satisfied with the changes you've chosen to include in your commit,
|
|||
|
||||
6. If you have a pull request based off the branch you are working on, {% data variables.product.prodname_desktop %} will display the status of the checks that have run for the pull request next to the "Current Branch" section of the repository bar. For more information about checks, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/viewing-and-re-running-checks-in-github-desktop)."
|
||||
|
||||
If a pull request has not been created for the current branch, {% data variables.product.prodname_desktop %} will give you the option to create one. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request)."
|
||||
If a pull request has not been created for the current branch, {% data variables.product.prodname_desktop %} will give you the option to preview the changes and create one. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request)."
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ If you configure {% data variables.large_files.product_name_long %} to track you
|
|||
{% data reusables.desktop.push-origin %}
|
||||
2. If {% data variables.product.prodname_desktop %} prompts you to fetch new commits from the remote, click **Fetch**.
|
||||
|
||||
3. Optionally, click **Create Pull Request** to open a pull request and collaborate on your changes. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request)"
|
||||
|
||||
1. Optionally, click **Preview Pull Request** to open a preview dialog where you can review your changes and begin to create a pull request. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request)."
|
||||
|
||||
|
||||
## Further reading
|
||||
- "[AUTOTITLE](/get-started/quickstart/github-glossary#push)" in the {% data variables.product.prodname_dotcom %} glossary
|
||||
|
|
|
|||
|
|
@ -15,11 +15,29 @@ Each commit shows:
|
|||
- The committer's username and profile photo (if available)
|
||||
- The commit's SHA-1 hash (the unique ID)
|
||||
|
||||
{% mac %}
|
||||
|
||||
{% data reusables.desktop.history-tab %}
|
||||
2. On the **History** tab, click the commit you'd like to review.
|
||||
3. If there are multiple files in the commit, click on an individual file to see the changes made to that file in that commit.
|
||||
|
||||
1. On the **History** tab, click the commit you'd like to review. You can also select a range of multiple consecutive commits using <kbd>Command</kbd> or <kbd>Shift</kbd>.
|
||||
|
||||
1. If there are multiple files in the commit or range of commits, click on an individual file to see the changes made to that file.
|
||||
|
||||
|
||||
|
||||
{% endmac %}
|
||||
|
||||
{% windows %}
|
||||
|
||||
{% data reusables.desktop.history-tab %}
|
||||
|
||||
1. On the **History** tab, click the commit you'd like to review. You can also select a range of multiple consecutive commits using <kbd>Ctrl</kbd> or <kbd>Shift</kbd>.
|
||||
![Screenshot of a list of commits in the "History" tab. Three consecutive selected commits are highlighted in blue and outlined in orange.]
|
||||
1. If there are multiple files in the commit or range of commits, click on an individual file to see the changes made to that file.
|
||||
!Screenshot of a commit view. To the right of the "History" tab, in a list of files, the "hello.txt" file is selected and highlighted with an orange outline.](/assets/images/help/desktop/branch-history-file.png)
|
||||
|
||||
{% endwindows %}
|
||||
|
||||
## Further reading
|
||||
|
||||
- "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch)"
|
||||
|
|
|
|||
|
|
@ -51,30 +51,33 @@ Before you create a pull request, you'll need to push changes to a branch on {%
|
|||
|
||||
## Creating a pull request
|
||||
|
||||
1. Click **Preview Pull Request**. {% data variables.product.prodname_desktop %} will open a preview dialog showing the diff of the changes between your current branch and the base branch.
|
||||
|
||||
{% mac %}
|
||||
|
||||
1. Switch to the branch that you want to create a pull request for. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#switching-between-branches)."
|
||||
2. Click **Create Pull Request**. {% data variables.product.prodname_desktop %} will open your default browser to take you to {% data variables.product.prodname_dotcom %}.
|
||||
|
||||
4. On {% data variables.product.prodname_dotcom %}, confirm that the branch in the **base:** drop-down menu is the branch where you want to merge your changes. Confirm that the branch in the **compare:** drop-down menu is the topic branch where you made your changes.
|
||||
|
||||
{% data reusables.repositories.pr-title-description %}
|
||||
{% data reusables.repositories.create-pull-request %}
|
||||
|
||||
|
||||
{% endmac %}
|
||||
|
||||
{% windows %}
|
||||
|
||||
1. Switch to the branch that you want to create a pull request for. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#switching-between-branches)."
|
||||
2. Click **Create Pull Request**. {% data variables.product.prodname_desktop %} will open your default browser to take you to {% data variables.product.prodname_dotcom %}.
|
||||
|
||||
3. On {% data variables.product.prodname_dotcom %}, confirm that the branch in the **base:** drop-down menu is the branch where you want to merge your changes. Confirm that the branch in the **compare:** drop-down menu is the topic branch where you made your changes.
|
||||
|
||||
{% data reusables.repositories.pr-title-description %}
|
||||
{% data reusables.repositories.create-pull-request %}
|
||||
|
||||
|
||||
{% endwindows %}
|
||||
|
||||
Alternatively, to go straight to {% data variables.product.prodname_dotcom %} to create your pull request, select the dropdown icon and click **Create Pull Request**.
|
||||
|
||||
1. Confirm that the branch in the **base:** dropdown menu is the branch where you want to merge your changes.
|
||||
|
||||
|
||||
{% data variables.product.prodname_desktop %} will advise you whether the current branch can be automatically merged into the base branch.
|
||||
|
||||
|
||||
1. Click **Create Pull Request**. {% data variables.product.prodname_desktop %} will open your default browser to take you to {% data variables.product.prodname_dotcom %}.
|
||||
|
||||
{% data reusables.repositories.pr-title-description %}
|
||||
{% data reusables.repositories.create-pull-request %}
|
||||
|
||||
## Further reading
|
||||
- "[AUTOTITLE](/get-started/quickstart/github-glossary#issue)" in the {% data variables.product.prodname_dotcom %} glossary
|
||||
- "[AUTOTITLE](/get-started/quickstart/github-glossary#pull-request)" in the {% data variables.product.prodname_dotcom %} glossary
|
||||
|
|
|
|||
|
|
@ -126,30 +126,33 @@ gh pr create --web
|
|||
|
||||
{% desktop %}
|
||||
|
||||
1. Click **Preview Pull Request**. {% data variables.product.prodname_desktop %} will open a preview dialog showing the diff of the changes between your current branch and the base branch.
|
||||
|
||||
{% mac %}
|
||||
|
||||
1. Switch to the branch that you want to create a pull request for. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#switching-between-branches)."
|
||||
2. Click **Create Pull Request**. {% data variables.product.prodname_desktop %} will open your default browser to take you to {% data variables.product.prodname_dotcom %}.
|
||||
|
||||
4. On {% data variables.product.prodname_dotcom %}, confirm that the branch in the **base:** drop-down menu is the branch where you want to merge your changes. Confirm that the branch in the **compare:** drop-down menu is the topic branch where you made your changes.
|
||||
|
||||
{% data reusables.repositories.pr-title-description %}
|
||||
{% data reusables.repositories.create-pull-request %}
|
||||
|
||||
|
||||
{% endmac %}
|
||||
|
||||
{% windows %}
|
||||
|
||||
1. Switch to the branch that you want to create a pull request for. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches#switching-between-branches)."
|
||||
2. Click **Create Pull Request**. {% data variables.product.prodname_desktop %} will open your default browser to take you to {% data variables.product.prodname_dotcom %}.
|
||||
|
||||
3. On {% data variables.product.prodname_dotcom %}, confirm that the branch in the **base:** drop-down menu is the branch where you want to merge your changes. Confirm that the branch in the **compare:** drop-down menu is the topic branch where you made your changes.
|
||||
|
||||
{% data reusables.repositories.pr-title-description %}
|
||||
{% data reusables.repositories.create-pull-request %}
|
||||
|
||||
|
||||
{% endwindows %}
|
||||
|
||||
Alternatively, to go straight to {% data variables.product.prodname_dotcom %} to create your pull request, select the dropdown icon and click **Create Pull Request**.
|
||||
|
||||
1. Confirm that the branch in the **base:** dropdown menu is the branch where you want to merge your changes.
|
||||
|
||||
|
||||
{% data variables.product.prodname_desktop %} will advise you whether the current branch can be automatically merged into the base branch.
|
||||
|
||||
|
||||
1. Click **Create Pull Request**. {% data variables.product.prodname_desktop %} will open your default browser to take you to {% data variables.product.prodname_dotcom %}.
|
||||
|
||||
{% data reusables.repositories.pr-title-description %}
|
||||
{% data reusables.repositories.create-pull-request %}
|
||||
|
||||
{% enddesktop %}
|
||||
|
||||
{% ifversion fpt or ghec %}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче