blocks|key|34580|text|在使用JetBrains集成开发环境时，“除了搁置和取消搁置之外，还支持隐藏和解除搁置操作。这些功能有很多共同之处；主要区别在于补丁的生成和应用方式。搁置可以操作单个文件，也可以操作一组文件，而Stash一次只能操作一大堆更改的文件。这里有一些关于它们之间差异的more+details。”|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|34581|entityMap|0|LINK|mutability|MUTABLE|url|http://www.jetbrains.com/phpstorm/help/shelving-and-unshelving-changes.html^0|3N|C|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

When using JetBrains IDE's with Git, "stashing and unstashing actions are supported in addition to shelving and unshelving. These features have much in common; the major difference is in the way patches are generated and applied. Shelve can operate with either individual files or bunch of files, while Stash can only operate with a whole bunch of changed files at once. Here are some <a href="http://www.jetbrains.com/phpstorm/help/shelving-and-unshelving-changes.html">more details</a> on the differences between them."

blocks|key|34605|text|除了前面的答案之外，还有一个对我来说很重要的注意事项：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|34606|shelve是JetBrains产品的特性(如WebStorm、PhpStorm、PyCharm等)。它将搁置的文件放入.idea/shelf目录。|offset|length|style|CODE|34607|stash是git选项之一。它将隐藏的文件放在.git目录下。|34608|entityMap^0|0|0|6|N|8|W|8|15|7|1O|B|0|0|5|6|3|N|4|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@$D|N|E|O|F|G]|$D|P|E|Q|F|G]|$D|R|E|S|F|G]|$D|T|E|U|F|G]|$D|V|E|W|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|X|8|@$D|Y|E|Z|F|G]|$D|10|E|11|F|G]|$D|12|E|13|F|G]]|9|@]|A|$]]|$1|J|3|-4|5|6|7|14|8|@]|9|@]|A|$]]]|K|$]]

In addition to previous answers there is one important for me note:

<code>shelve</code> is JetBrains products feature (such as <code>WebStorm</code>, <code>PhpStorm</code>, <code>PyCharm</code>, etc.). It puts shelved files into <code>.idea/shelf</code> directory.

<code>stash</code> is one of <code>git</code> options. It puts stashed files under the <code>.git</code> directory.

blocks|key|34648|text|货架是一个JetBrains功能，而Stash是一个Git功能，用于相同的工作。您可以使用这两个功能之一切换到不同的分支，而不会提交和丢失工作。我的个人经验是使用Shelf。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|34649|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Shelf is a JetBrains feature while Stash is a Git feature for same work. You can switch to different branch without commit and loss of work using either of features. My personal experience is to use Shelf.

I am very unfamiliar with the <code>shelve</code> aspect of Git. If <code>stash</code> is used to put aside unfinished work what is <code>shelve</code> then? What would you use it for?
For example on Update Project (from VCS menu)
<a href="https://i.stack.imgur.com/u0UO4.png" rel="noreferrer"><img src="https://i.stack.imgur.com/u0UO4.png" alt="enter image description here" /></a>
one will get (in IntelliJ IDEA 2019.2)
<a href="https://i.stack.imgur.com/US0hp.png" rel="noreferrer"><img src="https://i.stack.imgur.com/US0hp.png" alt="enter image description here" /></a>

Git Stash vs Shelve in IntelliJ IDEA

集成开发环境

IntelliJ IDEA

WebStorm

我对Git的shelve方面非常不熟悉。如果使用stash来搁置未完成的工作，那么什么是shelve？你会用它做什么？例如，更新项目(从VCS菜单)​​其中一个(在IntelliJ IDEA 2019.2中)​​

问Git Stash与IntelliJ IDEA中的搁置
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git Stash与IntelliJ IDEA中的搁置EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git Stash与IntelliJ IDEA中的搁置
EN