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/

最新文章

  1. 基于jquery的has()方法以及与find()方法以及filter()方法的区别详解
  2. PHP preg_replace使用例子
  3. CentOS 6中MATLAB print函数“所见非所得”bug的解决方案
  4. C++ 为什么拷贝构造函数参数必须为引用?赋值构造函数参数也必须为引用吗?
  5. (十)stm32中FSMC的使用(用于LCD)
  6. [转载] C++位运算:将一个4字节整数的二进制表示中的001替换为011
  7. C# CRC32
  8. 魅族MX2代理设置
  9. log4j文件
  10. windows 20003 扩展安装后不成功的原因
  11. WPF 打开文件 打开路径对话框
  12. angularjs金额大写过滤器
  13. 设计模式 - 观察者模式(Observer Pattern) 详细解释
  14. android 按钮Button单击背景切换
  15. Adobe 系列软件通用破解方式(animate cc,Photoshop cc,Flash cc)等
  16. [图形学] B样条曲线 - 原理和C++实现的演示程序(附源码)
  17. numpy.where() 用法详解
  18. 注解:大话AOP与Android的爱恨情仇
  19. transition: 0.2s all ease;
  20. tensorflow 添加一个全连接层

热门文章

  1. Redis系列(三)--消息队列、排行榜等
  2. 用TWaver加载大型游戏场景一例
  3. Effective C++标题整理
  4. 常量、变量;基本数据类型;input()、if、while、break、continue
  5. MySQL5
  6. CentOS \Linux文件权限详解
  7. 移动端禁止滑动的js处理方式
  8. 关于一个css布局的小记录
  9. LA 3029 Subsequence
  10. 【Codeforces 977F】Consecutive Subsequence