JIYIK CN >

git stashThis article will distinguish between and when using IntelliJ IDEA git shelve. These two come into play when we want to switch between multiple tasks while working and return to them later.

IntelliJ IDEA allows us to work on different features without losing our progress. We can save or shelve them.

The two have a lot in common. What makes a big difference is when the patches are generated and applied.

When we stash, Git generates patches and we can apply them using IntelliJ IDEA or other IDEs. On the other hand, when we shelve, patches are generated and applied in IntelliJ IDEA.

stash will store all uncommitted changes, while shelve allows us to choose what to shelve.

Shelving changes in Git

When we shelve changes, we temporarily store uncommitted changes so that we can work on them later when we need to switch to a different task. IntelliJ IDEA allows us to shelve individual files or all changes.

You can apply the resulting patch as many times as you want. This is the typical workflow.

1. On the IDE, we'll navigate to the commit tool. Once there, we can right-click on the changelist or file we want to shelve and select Shelve Changes.

   

2. Next, we'll review our list, Commit Messagename our shelf in and click on Shelve ChangesSave Shelf.

Another way is to use silentthe option. The IDE has an Shelve Silentlyoption that allows us to shelve without showing the dialog.

Unshelving changes in Git

To unshelve changes, follow the steps below.

1. Navigate to the tab on the IDE Shelfand select the file or change list you want to unshelve.

2. Click on it from the menu Unshelveand select the list you want to restore your shelved changes to. You can also create a new list if you don't want to restore them to an existing changelist.

   Remember to mark your new listing as active.

3. You can also use Unshelve Silentlythe icon and move changes to the active change list.

Storing changes in Git

The stash is just a record of the differences between your current working directory and HEADyour commit. You can apply branch patches as often as you like.

Please remember:

1. You may encounter conflicts when applying stash.
2. You cannot apply a stash to a working copy that contains uncommitted changes.

Follow the steps below to store changes using IntelliJ IDEA.

1. Navigate to Git>> 未提交的更改.存储更改
2. Select the correct directory and switch to the correct branch.
3. It is always good to briefly describe the storage in Messagethe field.
4. Click 创建存储.

Applying storage in Git

To apply storage, follow these steps.

• Navigate to Git>> Uncommitted Changes.Unstash Changes
• Select the correct directory and switch to the correct branch.
• Select Storage, click 查看to view which files will be changed after applying the patch, and then select 弹出存储to discard the patch after applying it.
• You can As new branchcreate a new branch and apply the patch by typing the branch name in the field.