repo sync

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 %}

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**.

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**.

content/desktop/contributing-and-collaborating-using-github-desktop/keeping-your-local-repository-in-sync-with-github/syncing-your-branch.md

@@ -45,40 +45,43 @@ 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)
 
-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 %}
-4. To push 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)
+   {% endmac %}
+
+   {% windows %}
 
-{% endmac %}
+   ![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)
 
-{% windows %}
+   {% endwindows %}
 
-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**.
+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 %}
-4. To push up your local changes, click **Force push origin**.
+4. To push 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 %}

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 %}
+{% data reusables.desktop.create-new-branch %}
 
-{% windows %}
+  ![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.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 %}
 

content/desktop/contributing-and-collaborating-using-github-desktop/making-changes-in-a-branch/viewing-the-branch-history.md

@@ -15,35 +15,27 @@ 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 <kbd>Command</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.](/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)
+   {% mac %}
 
+   You can also select a range of multiple consecutive commits using <kbd>Command</kbd> or <kbd>Shift</kbd>.
 
-{% endmac %}
+   {% endmac %}
 
-{% windows %}
+   {% windows %}
 
-{% data reusables.desktop.history-tab %}
+   You can also select a range of multiple consecutive commits using <kbd>Ctrl</kbd> or <kbd>Shift</kbd>.
 
-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>.
+   {% 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)
 
 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)"

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)

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 <kbd>Command</kbd> or <kbd>Shift</kbd>.
+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 <kbd>Command</kbd> or <kbd>Shift</kbd>.
 
-  ![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 %}
 
-{% endmac %}
+   {% windows %}
+
+   You can select one commit or select multiple commits using <kbd>Ctrl</kbd> or <kbd>Shift</kbd>.
 
-{% windows %}
+   {% endwindows %}
 
-{% 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 <kbd>Ctrl</kbd> or <kbd>Shift</kbd>.
+   ![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**.
 
-{% endwindows %}
-
 ## Error messages when squashing commits
 
 When you squash commits, you may see one of the following notifications or error messages.

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 %}

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,22 +25,21 @@ 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)
-2. On {% data variables.product.prodname_dotcom %}, click **Get started** to open an issue template or click **Open a blank issue**.
 
-{% endmac %}
+   {% endmac %}
 
-{% windows %}
+   {% 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**.
+   ![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 %}
 
-{% endwindows %}
+2. On {% data variables.product.prodname_dotcom %}, click **Get started** to open an issue template or click **Open a blank issue**.
 
 {% note %}
 
@@ -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