Merge pull request #3598 from github/desktop-stashing-changes

[GitHub Desktop] Stashing changes feature

Author: ethanpalm

assets/images/help/desktop/mac-changed-file-header.png

@@ -19,6 +19,7 @@ versions:
 {% topic_link_in_list /making-changes-in-a-branch %}
     {% link_in_list /managing-branches %}
     {% link_in_list /committing-and-reviewing-changes-to-your-project %}
+    {% link_in_list /stashing-changes %}
     {% link_in_list /pushing-changes-to-github %}
     {% link_in_list /reverting-a-commit %}
     {% link_in_list /managing-tags %}

assets/images/help/desktop/mac-discard-stashed-changes-button.png

@@ -67,8 +67,7 @@ If you create a branch on {% data variables.product.product_name %}, you'll need
   ![The Publish branch button](/assets/images/help/desktop/publish-branch-button.png)
 
 ### Switching between branches
-You can view and make commits to any of your repository's branches. If you have uncommitted, saved changes, you'll need to decide what to do with your changes before you can switch branches. You can commit your changes on the current branch, stash your changes on the current branch, or bring the changes to your new branch. If you want to commit your changes on the current branch, follow the steps in "[Committing and reviewing changes to your project](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)" before switching branches.
-
+You can view and make commits to any of your repository's branches. If you have uncommitted, saved changes, you'll need to decide what to do with your changes before you can switch branches. You can commit your changes on the current branch, stash your changes to temporarily save them on the current branch, or bring the changes to your new branch. If you want to commit your changes before switching branches, see "[Committing and reviewing changes to your project](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)."
 {% tip %}
 
 **Tip**: You can set a default behavior for switching branches in the **Advanced** settings. For more information, see "[Configuring basic settings](/desktop/getting-started-with-github-desktop/configuring-basic-settings)."
@@ -81,17 +80,6 @@ You can view and make commits to any of your repository's branches. If you have
 3. If you have saved, uncommitted changes, choose **Leave my changes** or **Bring my changes**, then click **Switch Branch**.
   ![Switch branch with changes options](/assets/images/help/desktop/stash-changes-options.png)
 
-### Retrieving stashed changes
-To access changes you've stashed in another branch, switch back to the branch you stashed the changes in.
-
-{% data reusables.desktop.current-branch-menu %}
-{% data reusables.desktop.switching-between-branches %}
-  ![List of branches in the repository](/assets/images/help/desktop/click-branch-in-drop-down-mac.png)
-3. In the left sidebar, click **Stashed Changes**.
-![Stashed changes option](/assets/images/help/desktop/stashed-changes.png)
-4. To delete your stashed changes, click **Discard**, or to use your stashed changes, click **Restore**.
-![Discard or Restore stashed changes](/assets/images/help/desktop/discard-restore-stash-buttons.png)
-
 ### Deleting a branch
 
 You can't delete a branch if it's currently associated with an open pull request. You cannot undo deleting a branch.
@@ -120,3 +108,4 @@ You can't delete a branch if it's currently associated with an open pull request
 - "[Branch](/articles/github-glossary/#branch)" in the {% data variables.product.prodname_dotcom %} glossary
 - "[About branches](/articles/about-branches)"
 - "[Branches in a Nutshell](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell)" in the Git documentation
+- "[Stashing changes](/desktop/contributing-and-collaborating-using-github-desktop/stashing-changes)"