diff --git a/assets/images/help/desktop/add-local-repository-windows.png b/assets/images/help/desktop/add-local-repository-windows.png index a99e8ec323..66011b3fa2 100644 Binary files a/assets/images/help/desktop/add-local-repository-windows.png and b/assets/images/help/desktop/add-local-repository-windows.png differ diff --git a/assets/images/help/desktop/add-repo-choose-button-win.png b/assets/images/help/desktop/add-repo-choose-button-win.png deleted file mode 100644 index 4205c09ce0..0000000000 Binary files a/assets/images/help/desktop/add-repo-choose-button-win.png and /dev/null differ diff --git a/assets/images/help/desktop/add-repository-button-windows.png b/assets/images/help/desktop/add-repository-button-windows.png deleted file mode 100644 index 301de2a0d2..0000000000 Binary files a/assets/images/help/desktop/add-repository-button-windows.png and /dev/null differ diff --git a/assets/images/help/desktop/appearance-tab-themes-windows.png b/assets/images/help/desktop/appearance-tab-themes-windows.png new file mode 100644 index 0000000000..6c246fdcbb Binary files /dev/null and b/assets/images/help/desktop/appearance-tab-themes-windows.png differ diff --git a/assets/images/help/desktop/choose-repository-location-win.png b/assets/images/help/desktop/choose-repository-location-win.png deleted file mode 100644 index 42405bf143..0000000000 Binary files a/assets/images/help/desktop/choose-repository-location-win.png and /dev/null differ diff --git a/assets/images/help/desktop/click-branch-in-drop-down-mac.png b/assets/images/help/desktop/click-branch-in-drop-down-mac.png deleted file mode 100644 index 2099567450..0000000000 Binary files a/assets/images/help/desktop/click-branch-in-drop-down-mac.png and /dev/null differ diff --git a/assets/images/help/desktop/click-branch-in-drop-down-win.png b/assets/images/help/desktop/click-branch-in-drop-down-win.png deleted file mode 100644 index 1ada82ef83..0000000000 Binary files a/assets/images/help/desktop/click-branch-in-drop-down-win.png and /dev/null differ diff --git a/assets/images/help/desktop/clone-a-repository-list-win.png b/assets/images/help/desktop/clone-a-repository-list-win.png deleted file mode 100644 index 76d74bb754..0000000000 Binary files a/assets/images/help/desktop/clone-a-repository-list-win.png and /dev/null differ diff --git a/assets/images/help/desktop/clone-choose-button-url-win.png b/assets/images/help/desktop/clone-choose-button-url-win.png deleted file mode 100644 index ac53362567..0000000000 Binary files a/assets/images/help/desktop/clone-choose-button-url-win.png and /dev/null differ diff --git a/assets/images/help/desktop/clone-choose-button-win.png b/assets/images/help/desktop/clone-choose-button-win.png deleted file mode 100644 index c8e41ad152..0000000000 Binary files a/assets/images/help/desktop/clone-choose-button-win.png and /dev/null differ diff --git a/assets/images/help/desktop/clone-file-menu-windows.png b/assets/images/help/desktop/clone-file-menu-windows.png index 1051045927..7f533d527a 100644 Binary files a/assets/images/help/desktop/clone-file-menu-windows.png and b/assets/images/help/desktop/clone-file-menu-windows.png differ diff --git a/assets/images/help/desktop/co-authors-demo-hq.gif b/assets/images/help/desktop/co-authors-demo-hq.gif deleted file mode 100644 index 66c1132a2e..0000000000 Binary files a/assets/images/help/desktop/co-authors-demo-hq.gif and /dev/null differ diff --git a/assets/images/help/desktop/commit-revert-win.png b/assets/images/help/desktop/commit-revert-win.png deleted file mode 100644 index 8a4a39ea8e..0000000000 Binary files a/assets/images/help/desktop/commit-revert-win.png and /dev/null differ diff --git a/assets/images/help/desktop/create-issue-windows.png b/assets/images/help/desktop/create-issue-windows.png index dd267cf17c..953c6ed439 100644 Binary files a/assets/images/help/desktop/create-issue-windows.png and b/assets/images/help/desktop/create-issue-windows.png differ diff --git a/assets/images/help/desktop/delete-branch-win.png b/assets/images/help/desktop/delete-branch-win.png index 479d033306..b63ad88761 100644 Binary files a/assets/images/help/desktop/delete-branch-win.png and b/assets/images/help/desktop/delete-branch-win.png differ diff --git a/assets/images/help/desktop/getting-started-guide/creating-a-repository.png b/assets/images/help/desktop/getting-started-guide/creating-a-repository.png deleted file mode 100644 index 62dc9084ec..0000000000 Binary files a/assets/images/help/desktop/getting-started-guide/creating-a-repository.png and /dev/null differ diff --git a/assets/images/help/desktop/help-about-desktop-win.png b/assets/images/help/desktop/help-about-desktop-win.png index e34d84fefb..c884c39d30 100644 Binary files a/assets/images/help/desktop/help-about-desktop-win.png and b/assets/images/help/desktop/help-about-desktop-win.png differ diff --git a/assets/images/help/desktop/mac-2fa-code-prompt.png b/assets/images/help/desktop/mac-2fa-code-prompt.png deleted file mode 100644 index 94c329b9bc..0000000000 Binary files a/assets/images/help/desktop/mac-2fa-code-prompt.png and /dev/null differ diff --git a/assets/images/help/desktop/mac-repository-settings.png b/assets/images/help/desktop/mac-repository-settings.png deleted file mode 100644 index 7c16bcbf07..0000000000 Binary files a/assets/images/help/desktop/mac-repository-settings.png and /dev/null differ diff --git a/assets/images/help/desktop/mac-save-git-config.png b/assets/images/help/desktop/mac-save-git-config.png deleted file mode 100644 index e628e6d2ac..0000000000 Binary files a/assets/images/help/desktop/mac-save-git-config.png and /dev/null differ diff --git a/assets/images/help/desktop/new-branch-button-win.png b/assets/images/help/desktop/new-branch-button-win.png deleted file mode 100644 index 39bedd4bff..0000000000 Binary files a/assets/images/help/desktop/new-branch-button-win.png and /dev/null differ diff --git a/assets/images/help/desktop/open-pr-in-desktop.png b/assets/images/help/desktop/open-pr-in-desktop.png index f22caf4037..677bcdccc9 100644 Binary files a/assets/images/help/desktop/open-pr-in-desktop.png and b/assets/images/help/desktop/open-pr-in-desktop.png differ diff --git a/assets/images/help/desktop/publish-repository-dialog-button-win.png b/assets/images/help/desktop/publish-repository-dialog-button-win.png deleted file mode 100644 index c53478a7c8..0000000000 Binary files a/assets/images/help/desktop/publish-repository-dialog-button-win.png and /dev/null differ diff --git a/assets/images/help/desktop/publish-repository-name-win.png b/assets/images/help/desktop/publish-repository-name-win.png deleted file mode 100644 index 348009f9b6..0000000000 Binary files a/assets/images/help/desktop/publish-repository-name-win.png and /dev/null differ diff --git a/assets/images/help/desktop/publish-repository-org-dropdown-win.png b/assets/images/help/desktop/publish-repository-org-dropdown-win.png deleted file mode 100644 index ca3646e4b7..0000000000 Binary files a/assets/images/help/desktop/publish-repository-org-dropdown-win.png and /dev/null differ diff --git a/assets/images/help/desktop/publish-repository-private-checkbox-win.png b/assets/images/help/desktop/publish-repository-private-checkbox-win.png deleted file mode 100644 index 85c99c322a..0000000000 Binary files a/assets/images/help/desktop/publish-repository-private-checkbox-win.png and /dev/null differ diff --git a/assets/images/help/desktop/repository-settings-win.png b/assets/images/help/desktop/repository-settings-win.png index 0fef2ccccd..03af97738b 100644 Binary files a/assets/images/help/desktop/repository-settings-win.png and b/assets/images/help/desktop/repository-settings-win.png differ diff --git a/assets/images/help/desktop/window-select-options-pane.png b/assets/images/help/desktop/window-select-options-pane.png new file mode 100644 index 0000000000..9bca48f074 Binary files /dev/null and b/assets/images/help/desktop/window-select-options-pane.png differ diff --git a/assets/images/help/desktop/windows-choose-options.png b/assets/images/help/desktop/windows-choose-options.png index a1e0a8c1cb..65b99c34ce 100644 Binary files a/assets/images/help/desktop/windows-choose-options.png and b/assets/images/help/desktop/windows-choose-options.png differ diff --git a/assets/images/help/desktop/windows-click-uninstall.png b/assets/images/help/desktop/windows-click-uninstall.png deleted file mode 100644 index 30b255c915..0000000000 Binary files a/assets/images/help/desktop/windows-click-uninstall.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-create-pull-request.png b/assets/images/help/desktop/windows-create-pull-request.png deleted file mode 100644 index 3ded9cd20a..0000000000 Binary files a/assets/images/help/desktop/windows-create-pull-request.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-editor-menu.png b/assets/images/help/desktop/windows-editor-menu.png deleted file mode 100644 index f742b5375e..0000000000 Binary files a/assets/images/help/desktop/windows-editor-menu.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-email-git-config.png b/assets/images/help/desktop/windows-email-git-config.png deleted file mode 100644 index 75d6a3fb98..0000000000 Binary files a/assets/images/help/desktop/windows-email-git-config.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-enable-notifications.png b/assets/images/help/desktop/windows-enable-notifications.png deleted file mode 100644 index ca385c1774..0000000000 Binary files a/assets/images/help/desktop/windows-enable-notifications.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-file-menu.png b/assets/images/help/desktop/windows-file-menu.png old mode 100644 new mode 100755 index 38ab47f30b..667a706dee Binary files a/assets/images/help/desktop/windows-file-menu.png and b/assets/images/help/desktop/windows-file-menu.png differ diff --git a/assets/images/help/desktop/windows-fork-behavior-menu-contribute.png b/assets/images/help/desktop/windows-fork-behavior-menu-contribute.png deleted file mode 100644 index a8d81ff3ee..0000000000 Binary files a/assets/images/help/desktop/windows-fork-behavior-menu-contribute.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-name-git-config.png b/assets/images/help/desktop/windows-name-git-config.png deleted file mode 100644 index 704cef366e..0000000000 Binary files a/assets/images/help/desktop/windows-name-git-config.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-rebase-current-branch.png b/assets/images/help/desktop/windows-rebase-current-branch.png index 76ce70ef48..005765efaa 100644 Binary files a/assets/images/help/desktop/windows-rebase-current-branch.png and b/assets/images/help/desktop/windows-rebase-current-branch.png differ diff --git a/assets/images/help/desktop/windows-repository-settings.png b/assets/images/help/desktop/windows-repository-settings.png deleted file mode 100644 index 7fb0c39d5f..0000000000 Binary files a/assets/images/help/desktop/windows-repository-settings.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-select-accounts-pane.png b/assets/images/help/desktop/windows-select-accounts-pane.png deleted file mode 100644 index e495eda41e..0000000000 Binary files a/assets/images/help/desktop/windows-select-accounts-pane.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-select-git-pane.png b/assets/images/help/desktop/windows-select-git-pane.png index 6b009626d9..3124324e45 100644 Binary files a/assets/images/help/desktop/windows-select-git-pane.png and b/assets/images/help/desktop/windows-select-git-pane.png differ diff --git a/assets/images/help/desktop/windows-select-integrations-pane.png b/assets/images/help/desktop/windows-select-integrations-pane.png index ba05b8354c..e6d1eeae80 100644 Binary files a/assets/images/help/desktop/windows-select-integrations-pane.png and b/assets/images/help/desktop/windows-select-integrations-pane.png differ diff --git a/assets/images/help/desktop/windows-show-logs.png b/assets/images/help/desktop/windows-show-logs.png index 606bb0bff5..685bcc4376 100644 Binary files a/assets/images/help/desktop/windows-show-logs.png and b/assets/images/help/desktop/windows-show-logs.png differ diff --git a/assets/images/help/desktop/windows-sign-in-button-enterprise.png b/assets/images/help/desktop/windows-sign-in-button-enterprise.png deleted file mode 100644 index 0094ef010c..0000000000 Binary files a/assets/images/help/desktop/windows-sign-in-button-enterprise.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-sign-in-ghes.png b/assets/images/help/desktop/windows-sign-in-ghes.png new file mode 100644 index 0000000000..aa8f7cd38a Binary files /dev/null and b/assets/images/help/desktop/windows-sign-in-ghes.png differ diff --git a/assets/images/help/desktop/windows-sign-in-github.png b/assets/images/help/desktop/windows-sign-in-github.png new file mode 100644 index 0000000000..6a54b0a189 Binary files /dev/null and b/assets/images/help/desktop/windows-sign-in-github.png differ diff --git a/assets/images/help/desktop/windows-squash-and-merge-menu.png b/assets/images/help/desktop/windows-squash-and-merge-menu.png new file mode 100644 index 0000000000..8a43669f7c Binary files /dev/null and b/assets/images/help/desktop/windows-squash-and-merge-menu.png differ diff --git a/assets/images/help/desktop/windows-stash-all-changes.png b/assets/images/help/desktop/windows-stash-all-changes.png deleted file mode 100644 index 80d245b60d..0000000000 Binary files a/assets/images/help/desktop/windows-stash-all-changes.png and /dev/null differ diff --git a/assets/images/help/desktop/windows-uninstall-a-program.png b/assets/images/help/desktop/windows-uninstall-a-program.png index 6e7d87934d..fc7edca3f5 100644 Binary files a/assets/images/help/desktop/windows-uninstall-a-program.png and b/assets/images/help/desktop/windows-uninstall-a-program.png differ diff --git a/assets/images/help/repository/delete-comment-edit-details.png b/assets/images/help/repository/delete-comment-edit-details.png index ef17f8a38b..b7c610d78f 100644 Binary files a/assets/images/help/repository/delete-comment-edit-details.png and b/assets/images/help/repository/delete-comment-edit-details.png differ diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-a-repository-from-your-local-computer-to-github-desktop.md b/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-a-repository-from-your-local-computer-to-github-desktop.md index d30f9ee563..3290f11bdc 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-a-repository-from-your-local-computer-to-github-desktop.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-a-repository-from-your-local-computer-to-github-desktop.md @@ -26,11 +26,10 @@ shortTitle: Add a repository {% windows %} -1. In the **File** menu, click **Add local repository**. - ![Add Local Repository menu option](/assets/images/help/desktop/add-local-repository-windows.png) -2. Click **Choose...** and, using Windows Explorer, navigate to the local repository you want to add. - ![The Local Path field in the Windows app](/assets/images/help/desktop/add-repo-choose-button-win.png) +1. In the menu bar, select **File**, then click **Add local repository**. + ![Screenshot of the menu bar on Windows. The "File" dropdown menu is open, and an option labeled "Add local repository" is highlighted with an orange outline.](/assets/images/help/desktop/add-local-repository-windows.png) +2. In the "Add local repository" window, click **Choose...**, then use Windows Explorer to navigate to the local repository you want to add. + ![Screenshot of the "Add local repository" window. Next to the "repository path" field, a button, labeled "Choose", is highlighted with an orange outline.](/assets/images/help/desktop/add-repo-choose-button-mac.png) 4. Click **Add repository**. - ![The Add repository button in the Windows app](/assets/images/help/desktop/add-repository-button-windows.png) {% endwindows %} diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-an-existing-project-to-github-using-github-desktop.md b/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-an-existing-project-to-github-using-github-desktop.md index b34888737e..e08742c2aa 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-an-existing-project-to-github-using-github-desktop.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-an-existing-project-to-github-using-github-desktop.md @@ -8,7 +8,6 @@ versions: fpt: '*' shortTitle: Add an existing project --- -{% mac %} {% data reusables.git.remove-git-remote %} 1. [Add the repository to GitHub Desktop](/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-a-repository-from-your-local-computer-to-github-desktop). @@ -17,22 +16,4 @@ shortTitle: Add an existing project 1. Optionally, add a description for the repository. 1. Optionally, to publish a public repository, deselect **Keep this code private**. 1. Select the "Organization" dropdown menu, then either click the organization where you want to publish the repository, or, to publish the repository to your personal account, click **None**. -1. Click **Publish Repository**. - -{% endmac %} - -{% windows %} - -{% data reusables.git.remove-git-remote %} -2. [Add the repository to GitHub Desktop](/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/adding-a-repository-from-your-local-computer-to-github-desktop). -{% data reusables.desktop.publish-repository %} -4. Type the desired name of the repository in the **Name** field or use the default current local repository name. - ![The Name field](/assets/images/help/desktop/publish-repository-name-win.png) -5. To publish a public repository, unselect **Keep this code private**. - ![Keep this code private checkbox](/assets/images/help/desktop/publish-repository-private-checkbox-win.png) -6. Choose the organization in the **Organization** drop-down where you want to publish the repository, or select **None** to publish the repository to your personal account. - ![Organization drop-down](/assets/images/help/desktop/publish-repository-org-dropdown-win.png) -7. Click the **Publish repository** button. - ![The Publish repository button in the Publish repository dialog](/assets/images/help/desktop/publish-repository-dialog-button-win.png) - -{% endwindows %} +1. Click **Publish Repository**. \ No newline at end of file diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-a-repository-from-github-to-github-desktop.md b/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-a-repository-from-github-to-github-desktop.md index 5fb84a844f..fcd447479b 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-a-repository-from-github-to-github-desktop.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-a-repository-from-github-to-github-desktop.md @@ -10,16 +10,14 @@ shortTitle: Clone a GitHub repo --- {% tip %} -**Tip:** You also can use {% data variables.product.prodname_desktop %} to clone repositories that exist on {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-a-repository-from-github-to-github-desktop)." +**Tip:** You also can use {% data variables.product.prodname_desktop %} to clone repositories that exist on {% data variables.product.prodname_dotcom %}. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop)." {% endtip %} -{% mac %} - 1. Sign in to {% data variables.location.product_location %} and {% data variables.product.prodname_desktop %} before you start to clone. {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.open-with-github-desktop %} -5. Click **Choose...** and, using the Finder window, navigate to a local path where you want to clone the repository. +1. Click **Choose...** and navigate to a local directory where you want to clone the repository. ![Screenshot of the "URL" tab of the "Clone a Repository" window. Next to the "Local Path" field, a button, labeled "Choose", is highlighted with an orange outline.](/assets/images/help/desktop/clone-choose-button-url-mac.png) @@ -29,24 +27,4 @@ shortTitle: Clone a GitHub repo {% endnote %} -5. Click **Clone**. - -{% endmac %} - -{% windows %} - -1. Sign in to {% data variables.location.product_location %} and {% data variables.product.prodname_desktop %} before you start to clone. -{% data reusables.repositories.navigate-to-repo %} -{% data reusables.repositories.open-with-github-desktop %} -5. Click **Choose...** and, using Windows Explorer, navigate to a local path where you want to clone the repository. -![The choose button](/assets/images/help/desktop/clone-choose-button-url-win.png) - - {% note %} - - **Note:** If the repository is configured to use LFS, you will be prompted to initialize {% data variables.large_files.product_name_short %}. - - {% endnote %} - -5. Click **Clone**. - -{% endwindows %} +1. Click **Clone**. \ No newline at end of file diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch.md b/content/desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch.md index 5591f9f0be..6ce2d00a3d 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch.md @@ -45,12 +45,20 @@ Some workflows require or benefit from rebasing instead of merging. By rebasing ## Rebasing your project branch onto another branch -{% mac %} - 1. In the menu bar, select **Branch**, then click **Rebase Current Branch**. + {% mac %} + ![Screenshot of the menu bar on a Mac. On the expanded "Branch" dropdown menu, the cursor overs over an option labeled "Rebase Current Branch".](/assets/images/help/desktop/mac-rebase-current-branch.png) + {% endmac %} + + {% windows %} + + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the expanded "Branch" dropdown menu, an option labeled "Rebase Current Branch" is outlined in orange.](/assets/images/help/desktop/windows-rebase-current-branch.png) + + {% endwindows %} + 2. Click the branch you want to rebase into the current branch, then click **Rebase**. 3. If you're sure you want to rebase, click **Begin Rebase**. {% data reusables.desktop.resolve-merge-conflicts %} @@ -58,27 +66,22 @@ Some workflows require or benefit from rebasing instead of merging. By rebasing ![Screenshot of the repository bar. A button, labeled "Force push origin" and displayed with an icon of a double upward arrow, is outlined in orange.](/assets/images/help/desktop/force-push-origin.png) -{% endmac %} - -{% windows %} - -1. Use the **Branch** drop-down and click **Rebase Current Branch**. -![Rebase Current Branch in branch dropdown](/assets/images/help/desktop/windows-rebase-current-branch.png) -2. In the "Rebase" window, click the branch you want to rebase into the current branch, then click **Rebase**. -3. If you're sure you want to rebase, click **Begin Rebase**. -{% data reusables.desktop.resolve-merge-conflicts %} -4. To push up your local changes, click **Force push origin**. - - ![Screenshot of the repository bar. A button, labeled "Force push origin" and displayed with an icon of a double upward arrow, is outlined in orange.](/assets/images/help/desktop/force-push-origin.png) - -{% endwindows %} - ## Squashing and merging another branch into your project branch 1. In the menu bar, select **Branch**, then click **Squash and Merge into Current Branch**. + {% mac %} + ![Screenshot of the menu bar on a Mac. On the expanded "Branch" dropdown menu, the cursor hovers over an option labeled "Squash and Merge into Current Branch".](/assets/images/help/desktop/squash-and-merge-menu.png) + {% endmac %} + + {% windows %} + + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the expanded "Branch" dropdown menu, option labeled "Squash and merge into curre..." is outlined in orange.](/assets/images/help/desktop/windows-squash-and-merge-menu.png) + + {% endwindows %} + 2. In the "Squash and merge" window, click the branch you want to merge into the current branch, then click **Squash and merge**. {% note %} diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches.md b/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches.md index 2d477d6f6c..bf16518944 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/managing-branches.md @@ -30,30 +30,18 @@ You can always create a branch in {% data variables.product.prodname_desktop %} {% endtip %} -{% mac %} - {% data reusables.desktop.click-base-branch-in-drop-down %} + ![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png) + {% data reusables.desktop.create-new-branch %} + ![Screenshot of the "Current Branch" dropdown view. Next to the "Filter" field, a button, labeled "New Branch", is outlined in orange.](/assets/images/help/desktop/new-branch-button-mac.png) + {% data reusables.desktop.name-branch %} {% data reusables.desktop.select-base-branch %} {% data reusables.desktop.confirm-new-branch-button %} -{% endmac %} - -{% windows %} - -{% data reusables.desktop.click-base-branch-in-drop-down %} - ![Drop-down menu to switch your current branch](/assets/images/help/desktop/click-branch-in-drop-down-win.png) -{% data reusables.desktop.create-new-branch %} - ![New Branch option in the Branch menu](/assets/images/help/desktop/new-branch-button-win.png) -{% data reusables.desktop.name-branch %} -{% data reusables.desktop.select-base-branch %} -{% data reusables.desktop.confirm-new-branch-button %} - -{% endwindows %} - ## Creating a branch from a previous commit {% data reusables.desktop.history-tab %} @@ -103,7 +91,7 @@ You can't delete a branch if it's currently associated with an open pull request {% data reusables.desktop.select-branch-to-delete %} ![Screenshot of the "Current Branch" dropdown view. Under "Recent Branches", a branch, named "my-feature", is highlighted with an orange outline.](/assets/images/help/desktop/select-branch-from-dropdown.png) {% data reusables.desktop.delete-branch-win %} - ![Delete... option in the Branch menu](/assets/images/help/desktop/delete-branch-win.png) + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the expanded "Branch" dropdown menu, an option labeled "Delete" is outlined in orange.](/assets/images/help/desktop/delete-branch-win.png) {% endwindows %} diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/viewing-the-branch-history.md b/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/viewing-the-branch-history.md index 0203e04680..5788e8f5b8 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/viewing-the-branch-history.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/viewing-the-branch-history.md @@ -15,11 +15,20 @@ 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 %} +1. On the **History** tab, click the commit you'd like to review. -1. On the **History** tab, click the commit you'd like to review. You can also select a range of multiple consecutive commits using Command or Shift. + {% mac %} + + You can also select a range of multiple consecutive commits using Command or Shift. + + {% endmac %} + + {% windows %} + + You can also select a range of multiple consecutive commits using Ctrl or Shift. + + {% endwindows %} ![Screenshot of a list of commits in the "History" tab. Three consecutive selected commits are highlighted in blue and outlined in orange.](/assets/images/help/desktop/branch-history-commit.png) @@ -27,23 +36,6 @@ Each commit shows: ![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) - -{% 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 Ctrl or Shift. - - ![Screenshot of a list of commits in the "History" tab. Three consecutive selected commits are highlighted in blue and outlined in orange.](/assets/images/help/desktop/branch-history-commit.png) - -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)" diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit.md b/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit.md index bac938132d..dc9e880f7a 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/reverting-a-commit.md @@ -15,18 +15,6 @@ When you revert to a previous commit, the revert is also a commit. The original {% endtip %} -{% mac %} - {% data reusables.desktop.history-tab %} {% data reusables.desktop.revert-commit %} - ![Screenshot of a list of commits in the "History" tab. Next to a commit, in a context menu, the cursor hovers over the "Revert Changes in Commit" option.](/assets/images/help/desktop/commit-revert-mac.png) - -{% endmac %} - -{% windows %} - -{% data reusables.desktop.history-tab %} -{% data reusables.desktop.revert-commit %} - ![The Revert option above the diff view](/assets/images/help/desktop/commit-revert-win.png) - -{% endwindows %} + ![Screenshot of a list of commits in the "History" tab. Next to a commit, in a context menu, the cursor hovers over the "Revert Changes in Commit" option.](/assets/images/help/desktop/commit-revert-mac.png) \ No newline at end of file diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md b/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md index a5b70f876a..1953203e88 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md @@ -11,32 +11,28 @@ Squashing allows you to combine multiple commits in your branch's history into a ## Squashing a commit -{% mac %} - {% data reusables.desktop.current-branch-menu %} 2. In the list of branches, select the branch that has the commits that you want to squash. {% data reusables.desktop.history-tab %} -4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using Command or Shift. +4. Select the commits to squash and drop them on the commit you want to combine them with. + + {% mac %} + + You can select one commit or select multiple commits using Command or Shift. + + {% endmac %} + + {% windows %} + + You can select one commit or select multiple commits using Ctrl or Shift. + + {% endwindows %} + + ![Screenshot of a list of commits in the "History" tab. The cursor hovers over a commit, highlighted in blue. A hover-over text box says, "Squash 2 commits".](/assets/images/help/desktop/squash-drag-and-drop.png) - ![Screenshot of a list of commits in the "History" tab. The cursor hovers over a commit, highlighted in blue. A hover-over text box says, "Squash 2 commits".](/assets/images/help/desktop/squash-drag-and-drop.png) 5. Modify the commit message of your new commit. The commit messages of the selected commits you want to squash are pre-filled into the **Summary** and **Description** fields. 6. Click **Squash Commits**. -{% endmac %} - -{% windows %} - -{% data reusables.desktop.current-branch-menu %} -2. In the list of branches, select the branch that has the commits that you want to squash. -{% data reusables.desktop.history-tab %} -4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using Ctrl or Shift. - - ![Screenshot of a list of commits in the "History" tab. The cursor hovers over a commit, highlighted in blue. A hover-over text box says, "Squash 2 commits".](/assets/images/help/desktop/squash-drag-and-drop.png) -5. Modify the commit message of your new commit. The commit messages of the selected commits you want to squash are pre-filled into the **Summary** and **Description** fields. -6. Click **Squash Commits**. - -{% endwindows %} - ## Error messages when squashing commits When you squash commits, you may see one of the following notifications or error messages. diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md b/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md index 9a149894bf..a9e31b92ce 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/configuring-notifications-in-github-desktop.md @@ -47,8 +47,6 @@ For more information about macOS system notifications, see "[Use notifications o 2. Select **System**, then click **Notifications**. 3. Find **{% data variables.product.prodname_desktop %}** in the application list and click **On**. -![Enable Windows Notifications](/assets/images/help/desktop/windows-enable-notifications.png) - For more information about Windows system notifications, see "[Change notification settings in Windows](https://support.microsoft.com/en-us/windows/change-notification-settings-in-windows-8942c744-6198-fe56-4639-34320cf9444e)." {% endwindows %} diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request.md b/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request.md index 0fa63d9097..cb59e09c8c 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/working-with-your-remote-repository-on-github-or-github-enterprise/creating-an-issue-or-pull-request.md @@ -25,23 +25,22 @@ Before you create a pull request, you'll need to push changes to a branch on {% ## Creating an issue -{% mac %} - 1. In the menu bar, select **Repository**, then click **Create Issue on {% data variables.product.prodname_dotcom %}**. + + {% mac %} ![Screenshot of the menu bar on a Mac. In the expanded "Repository" dropdown menu, the cursor hovers over "Create Issue on GitHub".](/assets/images/help/desktop/create-issue-mac.png) + + {% endmac %} + + {% windows %} + + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the expanded "Repository" dropdown menu, an option labeled "Create Issue on GitHub" is outlined in orange.](/assets/images/help/desktop/create-issue-windows.png) + + {% endwindows %} + 2. On {% data variables.product.prodname_dotcom %}, click **Get started** to open an issue template or click **Open a blank issue**. -{% endmac %} - -{% windows %} - -1. In the menu bar, use the **Repository** drop-down menu, then click **Create issue on {% data variables.product.prodname_dotcom %}**. - ![The Repository value in the Branch menu](/assets/images/help/desktop/create-issue-windows.png) -2. On {% data variables.product.prodname_dotcom %}, click **Get started** to open an issue template or click **Open a blank issue**. - -{% endwindows %} - {% note %} **Note**: If issue templates aren't enabled in your current repository, {% data variables.product.prodname_desktop %} will direct you to a blank issue on {% data variables.product.prodname_dotcom %}. @@ -77,7 +76,7 @@ Before you create a pull request, you'll need to push changes to a branch on {% {% 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 -- "[AUTOTITLE](/get-started/quickstart/github-glossary#base-branch)" in the {% data variables.product.prodname_dotcom %} glossary -- "[AUTOTITLE](/get-started/quickstart/github-glossary#topic-branch)" in the {% data variables.product.prodname_dotcom %} glossary +- "[Issue](/get-started/quickstart/github-glossary#issue)" in the {% data variables.product.prodname_dotcom %} glossary +- "[Pull request](/get-started/quickstart/github-glossary#pull-request)" in the {% data variables.product.prodname_dotcom %} glossary +- "[Base branch](/get-started/quickstart/github-glossary#base-branch)" in the {% data variables.product.prodname_dotcom %} glossary +- "[Topic branch](/get-started/quickstart/github-glossary#topic-branch)" in the {% data variables.product.prodname_dotcom %} glossary diff --git a/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor.md b/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor.md index bdaa6347eb..2f8079944f 100644 --- a/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor.md +++ b/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor.md @@ -88,9 +88,8 @@ shortTitle: Configure default editor {% data reusables.desktop.windows-choose-options %} 3. In the Options window, select **Integrations**. - ![The Integrations pane in the Options window](/assets/images/help/desktop/windows-select-integrations-pane.png) -4. Use the "External Editor" drop-down menu, and choose the editor you want to set as your default. - ![The External editor menu in the Options menu bar](/assets/images/help/desktop/windows-editor-menu.png) -5. Click **Save**. + ![Screenshot of the "Options" window. In the left sidebar, the "Integrations" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/windows-select-integrations-pane.png) +4. Under "External Editor", use the dropdown menu to select the editor you want to set as your default. +5. Click **Save**. {% endwindows %} diff --git a/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings.md b/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings.md index 4558a1298d..61254baed7 100644 --- a/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings.md +++ b/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-basic-settings.md @@ -22,16 +22,14 @@ shortTitle: Configure basic settings {% windows %} {% data reusables.desktop.windows-choose-options %} -2. To view or change your settings, toggle between these panes: - - ![The Options menu navigation](/assets/images/help/desktop/windows-select-accounts-pane.png) +3. To view or change your settings, toggle between the panes in the "Options" window. + + ![Screenshot of the "Options" window. The left sidebar, with menu options such as "Accounts" and "Integrations", is highlighted with an orange outline.](/assets/images/help/desktop/window-select-options-pane.png) {% indented_data_reference reusables.desktop.preferences-options-tabs spaces=3 %} {% endwindows %} -You can choose from the following options. - ## Further reading - "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/setting-a-theme-for-github-desktop)" diff --git a/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md b/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md index aa7e3d88c6..4b0504a2bb 100644 --- a/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md +++ b/content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop.md @@ -41,14 +41,13 @@ Configuring your global author information in {% data variables.product.prodname {% windows %} {% data reusables.desktop.windows-choose-options %} -8. In the Options window, click **Git**. -![The Git Pane in the Options menu](/assets/images/help/desktop/windows-select-git-pane.png) +1. In the "Options" window, click **Git**. + + ![Screenshot of the "Git" pane in the "Options" window. In the left sidebar, an option labeled "Git" is highlighted in blue and outlined in orange.](/assets/images/help/desktop/windows-select-git-pane.png) + {% data reusables.desktop.name-field-git-config %} - ![The name field of the Git configuration](/assets/images/help/desktop/windows-name-git-config.png) {% data reusables.desktop.select-email-git-config %} - ![Select email address in Git configuration field](/assets/images/help/desktop/windows-email-git-config.png) {% data reusables.desktop.click-save-git-config %} - ![Save button in Git configuration field](/assets/images/help/desktop/windows-save-git-config.png) {% endwindows %} @@ -100,9 +99,10 @@ You can configure the default branch that will be used when you create a new rep {% data reusables.desktop.windows-choose-options %} 1. In the Options window, click **Git**. - ![The Git Pane in the Options menu](/assets/images/help/desktop/windows-select-git-pane.png) -1. Under "Default branch name for new repositories", select the default branch name you would like to use, or select "Other..." to enter a custom name. - ![Default branch name selection options](/assets/images/help/desktop/windows-select-default-branch-name.png) + + ![Screenshot of the "Git" pane in the "Options" window. In the left sidebar, an option labeled "Git" is highlighted in blue and outlined in orange.](/assets/images/help/desktop/windows-select-git-pane.png) + +1. Under "Default branch name for new repositories", select the default branch name you would like to use, or, to enter a custom name, select "Other...". {% data reusables.desktop.click-save-git-config %} {% endwindows %} diff --git a/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github.md b/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github.md index e91af209a0..dfef3c9f5a 100644 --- a/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github.md +++ b/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github.md @@ -23,6 +23,7 @@ Before you authenticate, {% data reusables.desktop.get-an-account %} 1. In the "Preferences" window, on the **Accounts** pane, click the **Sign In** button next to "{% data variables.product.prodname_dotcom_the_website %}". ![Screenshot of the "Accounts" pane in the "Preferences" window. Next to "GitHub.com", a button, labeled "Sign In", is outlined in orange.](/assets/images/help/desktop/sign-in-github.png) + {% data reusables.desktop.sign-in-browser %} {% data reusables.desktop.authenticate-in-browser %} {% data reusables.desktop.2fa-in-browser %} @@ -35,6 +36,7 @@ Before you authenticate, {% data reusables.desktop.get-an-account %} 1. In the "Preferences" window, on the **Accounts** pane, click the **Sign In** button next to "{% data variables.product.prodname_enterprise %}". ![Screenshot of the "Accounts" pane in the "Preferences" window. Next to "GitHub Enterprise", a button, labeled "Sign In", is outlined in orange.](/assets/images/help/desktop/sign-in-ghes.png) + 1. To add an account on {% data variables.location.product_location_enterprise %}, in the "Sign in" modal window, type the URL for your instance under "Enterprise address," then click **Continue**. {% data reusables.desktop.sign-in-browser %} 1. To authenticate to {% data variables.location.product_location_enterprise %} account, type your account credentials and click **Sign in**. @@ -48,9 +50,10 @@ Before you authenticate, {% data reusables.desktop.get-an-account %} ## Authenticating an account on {% data variables.product.prodname_dotcom %} {% data reusables.desktop.windows-choose-options %} -{% data reusables.desktop.windows-select-accounts %} -3. To the right of "GitHub.com," click **Sign in**. - ![Screenshot of the "Accounts" pane in the "Preferences" window. Next to "GitHub.com", a button, labeled "Sign In", is outlined in orange.](/assets/images/help/desktop/sign-in-github.png) +1. In the "Options" window, on the **Accounts** pane, click the **Sign In** button next to "{% data variables.product.prodname_dotcom_the_website %}". + + ![Screenshot of the "Accounts" pane in the "Options" window. Next to "GitHub.com", a button, labeled "Sign In", is outlined in orange.](/assets/images/help/desktop/windows-sign-in-github.png) + {% data reusables.desktop.sign-in-browser %} {% data reusables.user-settings.password-authentication-deprecation-desktop %} @@ -63,10 +66,11 @@ Before you authenticate, {% data reusables.desktop.get-an-account %} {% data reusables.desktop.windows-choose-options %} -{% data reusables.desktop.windows-select-accounts %} -{% data reusables.desktop.choose-product-authenticate %} +1. In the "Options" window, on the **Accounts** pane, click the **Sign In** button next to "{% data variables.product.prodname_enterprise %}". + + ![Screenshot of the "Accounts" pane in the "Options" window. Next to "GitHub Enterprise", a button, labeled "Sign In", is outlined in orange.](/assets/images/help/desktop/windows-sign-in-ghes.png) + 4. To add a {% data variables.product.prodname_enterprise %} account, type your credentials under "Enterprise address," then click **Continue**. - ![The Sign In button for GitHub Enterprise](/assets/images/help/desktop/windows-sign-in-button-enterprise.png) {% data reusables.desktop.retrieve-2fa %} {% endwindows %} @@ -82,7 +86,9 @@ For some errors, {% data variables.product.prodname_desktop %} will prompt you w {% mac %} 1. In the menu bar, select **Help**, then click **Show Logs in Finder**. - ![Screenshot of the "GitHub Desktop" menu bar on a Mac. Under the open "Help" dropdown menu, a cursor hovers over "Show Logs in Finder", highlighted in blue.](/assets/images/help/desktop/mac-show-logs.png) + + ![Screenshot of the "GitHub Desktop" menu bar on a Mac. Under the expanded "Help" dropdown menu, a cursor hovers over "Show Logs in Finder", highlighted in blue.](/assets/images/help/desktop/mac-show-logs.png) + 2. Select the log file from the date when you encountered the authentication error. {% endmac %} @@ -90,7 +96,9 @@ For some errors, {% data variables.product.prodname_desktop %} will prompt you w {% windows %} 1. Use the **Help** drop-down menu and click **Show Logs in Explorer**. - ![The Show Logs in Explorer button](/assets/images/help/desktop/windows-show-logs.png) + + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the expanded "Help" dropdown menu, an option labeled "Show Logs in Explorer" is outlined in orange.](/assets/images/help/desktop/windows-show-logs.png) + 2. Select the log file from the date when you encountered the authentication error. {% endwindows %} diff --git a/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/uninstalling-github-desktop.md b/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/uninstalling-github-desktop.md index 06557310f1..281ae7ef66 100644 --- a/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/uninstalling-github-desktop.md +++ b/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/uninstalling-github-desktop.md @@ -24,8 +24,7 @@ shortTitle: Uninstall GitHub Desktop 1. Open Control Panel. For more information, see [Where is Control Panel?](https://support.microsoft.com/en-us/help/13764/windows-where-is-control-panel) in Windows Help. 2. Under "Programs", click **Uninstall a program**. - ![The Uninstall a Program option in Control Panel](/assets/images/help/desktop/windows-uninstall-a-program.png) + ![Screenshot of a window labeled "Adjust your computer's settings". A link, labeled "Uninstall a program", is highlighted with an orange outline.](/assets/images/help/desktop/windows-uninstall-a-program.png) 3. Right-click the entry named **{% data variables.product.prodname_desktop %}**, then click **Uninstall**. - ![The Uninstall option](/assets/images/help/desktop/windows-click-uninstall.png) {% endwindows %} diff --git a/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/updating-github-desktop.md b/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/updating-github-desktop.md index 0921d03f24..14d66d8560 100644 --- a/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/updating-github-desktop.md +++ b/content/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/updating-github-desktop.md @@ -37,10 +37,14 @@ If you encounter a crash when attempting to launch {% data variables.product.pro {% windows %} -1. In the **Help** menu, click **About GitHub Desktop**. -![About GitHub Desktop menu option](/assets/images/help/desktop/help-about-desktop-win.png) +1. In the menu bar, select **Help**, then click **About GitHub Desktop**. + + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the open "Help" dropdown menu, an option labeled "About GitHub Desktop" is outlined in orange.](/assets/images/help/desktop/help-about-desktop-win.png) + 2. Click **Check for Updates**. -![Screenshot of the "GitHub Desktop" window. Under version details and links to external resources, a button, labeled "Check for Updates", is outlined in orange.](/assets/images/help/desktop/check-for-updates.png) + + ![Screenshot of the "GitHub Desktop" window. Under version details and links to external resources, a button, labeled "Check for Updates", is outlined in orange.](/assets/images/help/desktop/check-for-updates.png) + 3. If an update is available, quit and relaunch {% data variables.product.prodname_desktop %} to install the update. {% endwindows %} diff --git a/content/desktop/installing-and-configuring-github-desktop/overview/creating-your-first-repository-using-github-desktop.md b/content/desktop/installing-and-configuring-github-desktop/overview/creating-your-first-repository-using-github-desktop.md index 47990ee4ba..39dd56c12b 100644 --- a/content/desktop/installing-and-configuring-github-desktop/overview/creating-your-first-repository-using-github-desktop.md +++ b/content/desktop/installing-and-configuring-github-desktop/overview/creating-your-first-repository-using-github-desktop.md @@ -90,9 +90,10 @@ Now that you've created and published your repository, you're ready to make chan ![Screenshot of the "Changes" tab in the sidebar. To the right of a profile picture, a text field containing a commit message is outlined in orange.](/assets/images/help/desktop/commit-message.png) 5. Below your commit message, click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want. 6. To push your changes to the remote repository on {% data variables.product.product_name %}, click **Push origin**. - ![Screenshot of the "Repository" menu bar. A button, labeled "Push origin", is highlighted with an orange outline.](/assets/images/help/desktop/push-to-origin.png) - - The **Push origin** button is the same one that you clicked to publish your repository to {% data variables.product.product_name %}. This button changes contextually based on where you are at in the Git workflow. It should now say `Push origin` with a `1` next to it, indicating that there is one commit that has not been pushed up to {% data variables.product.product_name %}. - - The "origin" in **Push origin** means that you are pushing changes to the remote called `origin`, which in this case is your project's repository on {% data variables.product.prodname_dotcom_the_website %}. Until you push any new commits to {% data variables.product.product_name %}, there will be differences between your project's repository on your computer and your project's repository on {% data variables.product.prodname_dotcom_the_website %}. This allows you to work locally and only push your changes to {% data variables.product.prodname_dotcom_the_website %} when you're ready. + ![Screenshot of the "Repository" menu bar. A button, labeled "Push origin", is highlighted with an orange outline.](/assets/images/help/desktop/push-to-origin.png) + + - The **Push origin** button is the same one that you clicked to publish your repository to {% data variables.product.product_name %}. This button changes contextually based on where you are at in the Git workflow. It should now say `Push origin` with a `1` next to it, indicating that there is one commit that has not been pushed up to {% data variables.product.product_name %}. + - The "origin" in **Push origin** means that you are pushing changes to the remote called `origin`, which in this case is your project's repository on {% data variables.product.prodname_dotcom_the_website %}. Until you push any new commits to {% data variables.product.product_name %}, there will be differences between your project's repository on your computer and your project's repository on {% data variables.product.prodname_dotcom_the_website %}. This allows you to work locally and only push your changes to {% data variables.product.prodname_dotcom_the_website %} when you're ready. 7. In the window to the right of the **Changes** view, you'll see suggestions for actions you can do next. To open the repository on {% data variables.product.product_name %} in your browser, click **View on {% data variables.product.product_name %}**. ![Screenshot of the "No local changes" screen. In a list of suggestions, a button, labeled "View on GitHub", is highlighted with an orange outline.](/assets/images/help/desktop/available-actions.png) 8. In your browser, click **2 commits**. You'll see a list of the commits in this repository on {% data variables.product.product_name %}. The first commit should be the commit you just made in {% data variables.product.prodname_desktop %}. diff --git a/content/desktop/installing-and-configuring-github-desktop/overview/getting-started-with-github-desktop.md b/content/desktop/installing-and-configuring-github-desktop/overview/getting-started-with-github-desktop.md index 3fe3a66bd7..45364d530f 100644 --- a/content/desktop/installing-and-configuring-github-desktop/overview/getting-started-with-github-desktop.md +++ b/content/desktop/installing-and-configuring-github-desktop/overview/getting-started-with-github-desktop.md @@ -42,7 +42,7 @@ After you have installed {% data variables.product.prodname_desktop %}, you can 1. Before you can authenticate to {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, you will need an account. For more information about creating an account, see "[AUTOTITLE](/get-started/signing-up-for-github/signing-up-for-a-new-github-account)" or contact your {% data variables.product.prodname_enterprise %} site administrator. 2. In the File drop-down menu, click **Options**. In the options window, click **Accounts** and follow the steps to sign in. For more information on authenticating, see "[AUTOTITLE](/desktop/installing-and-configuring-github-desktop/installing-and-authenticating-to-github-desktop/authenticating-to-github)." - ![The Sign In button for GitHub](/assets/images/help/desktop/sign-in-github.png) + ![Screenshot of the "Accounts" pane in the "Options" window. Next to "GitHub.com", a button, labeled "Sign In", is outlined in orange.](/assets/images/help/desktop/windows-sign-in-github.png) {% endwindows %} @@ -83,7 +83,7 @@ You can clone a repository from {% data variables.product.prodname_dotcom %} by {% windows %} - ![The File menu options for creating, adding, and cloning repositories](/assets/images/help/desktop/windows-file-menu.png) + ![Screenshot of the "GitHub Desktop" menu bar on Windows. Actions for repositories are listed in the open "File" dropdown menu.](/assets/images/help/desktop/windows-file-menu.png) {% endwindows %} diff --git a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally.md index 272af850c2..90f4ed0c0a 100644 --- a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally.md +++ b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally.md @@ -32,8 +32,9 @@ shortTitle: Check out a PR locally ![Link to access command line pull request instructions](/assets/images/help/pull_requests/open-with-button.png){% else %} 3. In the merge box, click **command line instructions**. Follow the sequence of steps to bring down the proposed pull request. ![Link to access command line pull request instructions](/assets/images/help/pull_requests/pull_request_show_command_line_merge.png) -4. Optionally, to view proposed changes in {% data variables.product.prodname_desktop %}, click **open this in {% data variables.product.prodname_desktop %}**. - ![Link to open a pull request locally in Desktop](/assets/images/help/desktop/open-pr-in-desktop.png){% endif %} +4. Optionally, to view proposed changes in {% data variables.product.prodname_desktop %}, next to the **Merge pull request** button, click **open this in {% data variables.product.prodname_desktop %}**. + + ![Screenshot of the "merge messages" section on a pull request page. A link, labeled "Open this in GitHub Desktop", is outlined in orange.](/assets/images/help/desktop/open-pr-in-desktop.png){% endif %} {% endwebui %} diff --git a/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md b/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md index 4e40f3e46e..cd3294dc00 100644 --- a/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md +++ b/content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors.md @@ -34,9 +34,7 @@ For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-manag ## Creating co-authored commits using {% data variables.product.prodname_desktop %} -You can use {% data variables.product.prodname_desktop %} to create a commit with a co-author. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project#4-write-a-commit-message-and-push-your-changes)" and [{% data variables.product.prodname_desktop %}](https://desktop.github.com). - -![Add a co-author to the commit message](/assets/images/help/desktop/co-authors-demo-hq.gif) +You can use {% data variables.product.prodname_desktop %} to create a commit with a co-author. For more information, see "[AUTOTITLE](/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project#write-a-commit-message-and-push-your-changes)" and [{% data variables.product.prodname_desktop %}](https://desktop.github.com). ## Creating co-authored commits on the command line diff --git a/data/reusables/desktop/choose-a-theme.md b/data/reusables/desktop/choose-a-theme.md index 3feba2c167..34e45654c5 100644 --- a/data/reusables/desktop/choose-a-theme.md +++ b/data/reusables/desktop/choose-a-theme.md @@ -1,5 +1,15 @@ -3. In the "Preferences" window, click **Appearance**. +3. Click the **Appearance** pane. + + {% mac %} ![Screenshot of the "Preferences" window. In the left sidebar, the "Appearance" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/appearance-tab-themes.png) -4. Click the theme you'd like to use. If you want {% data variables.product.prodname_desktop %} to always match the theme on your computer, select **System**. + {% endmac %} + + {% windows %} + + ![Screenshot of the "Options" window. In the left sidebar, the "Appearance" option is highlighted in blue and outlined in orange.](/assets/images/help/desktop/appearance-tab-themes-windows.png) + + {% endwindows %} + +4. Click the theme you'd like to use. If you want {% data variables.product.prodname_desktop %} to always match the theme on your computer, select **System**. \ No newline at end of file diff --git a/data/reusables/desktop/choose-clone-repository.md b/data/reusables/desktop/choose-clone-repository.md index bd9e194edc..5624c2fe25 100644 --- a/data/reusables/desktop/choose-clone-repository.md +++ b/data/reusables/desktop/choose-clone-repository.md @@ -8,6 +8,6 @@ {% windows %} - ![Clone menu option in the Windows app](/assets/images/help/desktop/clone-file-menu-windows.png) + ![Screenshot of the "GitHub Desktop" menu bar on Windows. The "File" dropdown menu is expanded, and the "Clone Repository" option is highlighted with an orange outline.](/assets/images/help/desktop/clone-file-menu-windows.png) {% endwindows %} diff --git a/data/reusables/desktop/choose-local-path.md b/data/reusables/desktop/choose-local-path.md index 2c1b486ba2..2d51cb9593 100644 --- a/data/reusables/desktop/choose-local-path.md +++ b/data/reusables/desktop/choose-local-path.md @@ -1,13 +1,3 @@ 1. To select the local directory into which you want to clone the repository, next to the "Local Path" field, click **Choose...** and navigate to the directory. - {% mac %} - - ![Screenshot of the "Clone a repository" window. A button, labeled "Choose", is highlighted with an orange outline.](/assets/images/help/desktop/clone-choose-button-mac.png) - - {% endmac %} - - {% windows %} - - ![The choose button](/assets/images/help/desktop/clone-choose-button-win.png) - - {% endwindows %} + ![Screenshot of the "Clone a repository" window. A button, labeled "Choose", is highlighted with an orange outline.](/assets/images/help/desktop/clone-choose-button-mac.png) \ No newline at end of file diff --git a/data/reusables/desktop/choose-product-authenticate.md b/data/reusables/desktop/choose-product-authenticate.md deleted file mode 100644 index 1dc8e66f6d..0000000000 --- a/data/reusables/desktop/choose-product-authenticate.md +++ /dev/null @@ -1,2 +0,0 @@ -1. To the right of "{% data variables.product.prodname_enterprise %} Server," click **Sign In**. - ![The Sign in button for GitHub Enterprise Server](/assets/images/help/desktop/sign-in-ghes.png) diff --git a/data/reusables/desktop/click-stash-all-changes.md b/data/reusables/desktop/click-stash-all-changes.md index 731992198e..8266ad0043 100644 --- a/data/reusables/desktop/click-stash-all-changes.md +++ b/data/reusables/desktop/click-stash-all-changes.md @@ -1,13 +1,3 @@ 1. Click **Stash All Changes**. - - {% mac %} ![Screenshot of the "Changes" tab. The header bar, labeled "1 changed file", is outlined in orange. In a context menu, the cursor hovers over "Stash All Changes".](/assets/images/help/desktop/mac-stash-all-changes.png) - - {% endmac %} - - {% windows %} - - ![The Stash all changes menu item](/assets/images/help/desktop/windows-stash-all-changes.png) - - {% endwindows %} diff --git a/data/reusables/desktop/cloning-location-tab.md b/data/reusables/desktop/cloning-location-tab.md index 110f0887d6..07c7d5b821 100644 --- a/data/reusables/desktop/cloning-location-tab.md +++ b/data/reusables/desktop/cloning-location-tab.md @@ -1,13 +1,3 @@ 1. Click the tab that corresponds to the location of the repository you want to clone. You can also click **URL** to manually enter the repository location. - {% mac %} - - ![Screenshot of the "Clone a repository" window. At the top of the window, tabs labeled "GitHub.com", "GitHub Enterprise" and "URL" are highlighted with an orange outline.](/assets/images/help/desktop/choose-repository-location-mac.png) - - {% endmac %} - - {% windows %} - - ![Location tabs in the Clone a repository menu](/assets/images/help/desktop/choose-repository-location-win.png) - - {% endwindows %} + ![Screenshot of the "Clone a repository" window. At the top of the window, tabs labeled "GitHub.com", "GitHub Enterprise" and "URL" are highlighted with an orange outline.](/assets/images/help/desktop/choose-repository-location-mac.png) \ No newline at end of file diff --git a/data/reusables/desktop/cloning-repository-list.md b/data/reusables/desktop/cloning-repository-list.md index b43756987f..bdc13f5ffc 100644 --- a/data/reusables/desktop/cloning-repository-list.md +++ b/data/reusables/desktop/cloning-repository-list.md @@ -1,14 +1,3 @@ 1. From the list of repositories, click the repository you want to clone. - - {% mac %} - - ![Screenshot of the "Clone a repository" window. The "github/docs" repository is highlighted with an orange outline.](/assets/images/help/desktop/clone-a-repository-list-mac.png) - - {% endmac %} - - {% windows %} - - ![Clone a repository list](/assets/images/help/desktop/clone-a-repository-list-win.png) - - {% endwindows %} + ![Screenshot of the "Clone a repository" window. The "github/docs" repository is highlighted with an orange outline.](/assets/images/help/desktop/clone-a-repository-list-mac.png) diff --git a/data/reusables/desktop/mac-repository-settings-menu.md b/data/reusables/desktop/mac-repository-settings-menu.md index 9f53d778b7..65a5803691 100644 --- a/data/reusables/desktop/mac-repository-settings-menu.md +++ b/data/reusables/desktop/mac-repository-settings-menu.md @@ -1,2 +1,3 @@ 1. In the "{% data variables.product.prodname_desktop %}" menu bar, select **Repository** and click **Repository Settings...**. -![Screenshot of the menu bar on a Mac. Under the open "Repository" dropdown menu, a cursor hovers over "Repository Settings", highlighted in blue.](/assets/images/help/desktop/repository-settings-mac.png) + + ![Screenshot of the menu bar on a Mac. In the open "Repository" dropdown menu, a cursor hovers over "Repository Settings", highlighted in blue.](/assets/images/help/desktop/repository-settings-mac.png) diff --git a/data/reusables/desktop/open-repository-settings.md b/data/reusables/desktop/open-repository-settings.md index 4d8759d058..699a00a857 100644 --- a/data/reusables/desktop/open-repository-settings.md +++ b/data/reusables/desktop/open-repository-settings.md @@ -1,14 +1,14 @@ 1. In the menu bar, select **Repository**, then click **Repository settings...**. - {% mac %} - - ![Screenshot of the menu bar on a Mac. Under the expanded "Repository" dropdown menu, a cursor hovers over "Repository Settings", highlighted in blue.](/assets/images/help/desktop/repository-settings-mac.png) - - {% endmac %} - - {% windows %} - - ![Repository settings menu option in the Windows app](/assets/images/help/desktop/windows-repository-settings.png) - - {% endwindows %} + {% mac %} + + ![Screenshot of the menu bar on a Mac. In the expanded "Repository" dropdown menu, a cursor hovers over "Repository Settings", highlighted in blue.](/assets/images/help/desktop/repository-settings-mac.png) + + {% endmac %} + + {% windows %} + + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the open "Repository" dropdown menu, an option labeled "Repository Settings" is outlined in orange.](/assets/images/help/desktop/repository-settings-win.png) + + {% endwindows %} diff --git a/data/reusables/desktop/retrieve-2fa.md b/data/reusables/desktop/retrieve-2fa.md index bd2927b47f..4180ec860b 100644 --- a/data/reusables/desktop/retrieve-2fa.md +++ b/data/reusables/desktop/retrieve-2fa.md @@ -1,6 +1,3 @@ 1. If you have configured two-factor authentication for {% data variables.product.prodname_enterprise %}, do one of the following: - If you set up 2FA via SMS, retrieve your 2FA code from an SMS message. - - If you set up 2FA with a TOTP application, generate a 2FA code. - - Then enter your 2FA code in the prompt on {% data variables.product.prodname_desktop %} and click **Sign In**. - ![The 2FA Authentication code field](/assets/images/help/desktop/mac-2fa-code-prompt.png) + - If you set up 2FA with a TOTP application, generate a 2FA code. \ No newline at end of file diff --git a/data/reusables/desktop/select-fork-behavior.md b/data/reusables/desktop/select-fork-behavior.md index 1ea8a3bbdc..769f6fd0f4 100644 --- a/data/reusables/desktop/select-fork-behavior.md +++ b/data/reusables/desktop/select-fork-behavior.md @@ -1,16 +1,6 @@ 1. In the "Repository settings" window, in the left-hand sidebar, click **Fork Behavior**. 1. Under "I'll be using this fork...", use the radio buttons to select how you want to use the fork. - {% mac %} - ![Screenshot of the "Fork Behavior" pane. Two radio buttons, labeled "To contribute to the parent repository" and "For my own purposes", are outlined in orange.](/assets/images/help/desktop/mac-fork-behavior-menu-contribute.png) - {% endmac %} - - {% windows %} - - ![The contribute to the parent repository option in the Fork Behavior menu](/assets/images/help/desktop/windows-fork-behavior-menu-contribute.png) - - {% endwindows %} - 1. Click **Save**. diff --git a/data/reusables/desktop/windows-choose-options.md b/data/reusables/desktop/windows-choose-options.md index 9a7302e2e1..461668c3d0 100644 --- a/data/reusables/desktop/windows-choose-options.md +++ b/data/reusables/desktop/windows-choose-options.md @@ -1,2 +1,3 @@ 1. Use the **File** menu, then click **Options**. - ![The Options value in the Settings drop-down menu](/assets/images/help/desktop/windows-choose-options.png) + + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the expanded "File" dropdown menu, the "Options" item is highlighted with an orange outline.](/assets/images/help/desktop/windows-choose-options.png) diff --git a/data/reusables/desktop/windows-repository-settings-menu.md b/data/reusables/desktop/windows-repository-settings-menu.md index 092d6ebb9c..36454db238 100644 --- a/data/reusables/desktop/windows-repository-settings-menu.md +++ b/data/reusables/desktop/windows-repository-settings-menu.md @@ -1,2 +1,3 @@ 1. In the **Repository** menu, click **Repository settings...**. -![Repository settings menu option](/assets/images/help/desktop/repository-settings-win.png) + + ![Screenshot of the "GitHub Desktop" menu bar on Windows. In the open "Repository" dropdown menu, an option labeled "Repository Settings" is outlined in orange.](/assets/images/help/desktop/repository-settings-win.png) diff --git a/data/reusables/desktop/windows-select-accounts.md b/data/reusables/desktop/windows-select-accounts.md deleted file mode 100644 index 09dee850d1..0000000000 --- a/data/reusables/desktop/windows-select-accounts.md +++ /dev/null @@ -1,2 +0,0 @@ -1. In the Options window, select **Accounts**. - ![The Accounts pane in the Options window](/assets/images/help/desktop/windows-select-accounts-pane.png)