Solution:Cannot pull with rebase: You have unstaged changes in Github

最新推荐文章于 2025-03-22 09:49:29 发布

转载最新推荐文章于 2025-03-22 09:49:29 发布 · 418 阅读

0 ·

CC 4.0 BY-SA版权

原文链接：http://www.cnblogs.com/Ph-one/p/5313428.html

文章标签：

#git

本文详细介绍了如何使用Git的stash功能解决工作流程中的常见问题，包括如何暂存更改、从stash中弹出更改以及创建分支来应用stash的更改。通过实验性的使用stash功能，可以避免在重要工作上出现意外。

You can do this to work around using following steps

1. stash your changes with: git stash
2. pull from master with rebase: git pull –rebase
3. Then execute simpler git stash pop. With this command, it deletes that stash for good, while apply does not.

Here I have used git stash pop but After changes have been stashed, there are a few options of to get changes back to local:

1. git stash pop: This command takes a stashed change and removes changes from the stash stack and apply it to your current working tree.

2. git stash applies : This command takes a stashed change and applies it to your current working tree. You need to delete stash stack using git stash drop .

3. git stash branch: This command creates a new branch from the same commit you were on when you stashed the changes and applies the stashed changes to the new branch.

Experiment with the stash before using it on some really important work

http://www.thecreativedev.com/solutioncannot-pull-with-rebase-you-have-unstaged-changes-in-github/

转载于:https://www.cnblogs.com/Ph-one/p/5313428.html