webstorem update git

最新推荐文章于 2024-05-25 02:56:44 发布

weixin_33827731

最新推荐文章于 2024-05-25 02:56:44 发布

阅读量194

点赞数

CC 4.0 BY-SA版权

文章标签： git 开发工具

原文链接：https://segmentfault.com/a/1190000010795722

本文介绍了在进行Git更新时的不同策略选项，包括Merge、Rebase及Branch Default等，并详细解释了如何选择适合的方法来保存工作区更改，如使用Stash或Shelve等特性。

Update Type

Merge: choose this option to have the merge strategy applied. The result is identical with that of running git fetch ; git merge or git pull --no-rebase.

Rebase: choose this option to have the rebase strategy applied. The result is identical with that of running git fetch ; git rebase or git pull --rebase.

Branch Default: choose this option to have the default command for the branch applied. The default command is specified in the branch.<name> section of the .git/config configuration file.

Clean working tree before update

In this area, specify the method to save your changes while cleaning your working tree before update. The changes will be restored after the update is completed. The available options are:

Using Stash: choose this option to have the changes saved in a Git stash, so you can apply patches with stashed changed even outside IntelliJ IDEA, because they are generated by Git itself.

Using Shelve: choose this option to have the changes saved on a shelf. Shelving is a IntelliJ IDEA internal operation, patches generated from shelved changes are normally applied (unshelved) inside IntelliJ IDEA. Applying shelved changes outside IntelliJ IDEA is also possible but requires additional steps.