-
Notifications
You must be signed in to change notification settings - Fork 59.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
33 additions
and
24 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 14 additions & 24 deletions
38
...desktop/contributing-and-collaborating-using-github-desktop/stashing-changes.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,31 @@ | ||
--- | ||
title: Stashing changes | ||
intro: You can stash changes to temporarily save them without committing them to a branch. | ||
intro: You can temporarily save your changes without committing the changes to a branch by stashing the changes. | ||
versions: | ||
free-pro-team: '*' | ||
--- | ||
|
||
### About stashed changes | ||
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 stash all uncommitted changes to temporarily save the changes without committing them, and then reapply the changes later. You can only stash one set of changes at a time with {% data variables.product.prodname_desktop %}. After you stash changes on a branch, you can safely change branches or make other changes to your current branch. | ||
To apply your changes to your repository, you must save the files and then commit the changes to a branch. If you have saved changes that you are not ready to commit yet, you can stash the changes for later. When you stash changes, the changes are temporarily removed from the files and you can choose to restore or discard the changes later. You can only stash one set of changes at a time with {% data variables.product.prodname_desktop %}. If you use {% data variables.product.prodname_desktop %} to stash changes, all unsaved changes will be stashed. After you stash changes on a branch, you can safely change branches or make other changes to your current branch. | ||
|
||
You can also stash changes when you switch branches. For more information, see "[Managing branches](/desktop/contributing-to-projects/managing-branches#switching-between-branches)." | ||
|
||
### Stashing changes | ||
|
||
{% data reusables.desktop.click-changed-files-header %} | ||
{% data reusables.desktop.click-stash-all-changes %} | ||
|
||
### Switching between branches | ||
|
||
{% 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)." | ||
|
||
{% endtip %} | ||
### Restoring stashed changes | ||
|
||
{% 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. 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) | ||
{% data reusables.desktop.navigate-to-stashed-changes %} | ||
{% data reusables.desktop.click-stashed-changes %} | ||
3. Click **Restore**. | ||
![Restore stashed changes button](/assets/images/help/desktop/restore-stashed-changes-button.png) | ||
|
||
### Retrieving stashed changes | ||
To access changes you've stashed in another branch, switch back to the branch you stashed the changes in. | ||
### Discarding stashed changes | ||
|
||
{% 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) | ||
{% data reusables.desktop.navigate-to-stashed-changes %} | ||
{% data reusables.desktop.click-stashed-changes %} | ||
1. Click **Discard**. | ||
![Discard stashed changes button](assets/images/help/desktop/discard-stashed-changes-button.png) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
1. In the left sidebar, click **Stashed Changes**. | ||
![Stashed changes option](/assets/images/help/desktop/stashed-changes.png) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
1. If you are not already on the branch where the changes are stashed, click {% octicon "git-branch" aria-label="The branch icon" %} **Current Branch**, then click the branch with stashed changes. | ||
![List of branches in the repository](/assets/images/help/desktop/click-branch-in-drop-down-mac.png) |