VS2015中使用Git遇到问题 Cannot do push / pull in git - working with visual studio
I have made a lot of changes, when I am trying to push them - I am getting the next error:
You cannot push branch master to remote origin because there are new commits in the remote repository’s branch. Pushing this branch would result in a non-fast-forward update on the branch in the remote repository.
When I am trying to pull the changes I get:
Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details.
I dont have any uncommitted changes...
I am stock from both ways and dont know how solve this issue.
Try this procedure to solve:
stash your local commits Try to get the changes and then push:
$ git stash
pull from master:
$ git pull
get your local changes back after pulling the master branch
$ git stash pop
commit your local changes
$ git commit
push
$ git push
最新文章
- Standard C 语言标准函数库介绍
- QT socket相关
- linux概念之/proc与/sys
- KindEditor图片上传到七牛云
- HDU 1241 Oil Deposits (DFS/BFS)
- Hdu2437-Jerboas(取余数判重搜索)
- 2014.9.25DOM元素操作
- 与众不同 windows phone (8) - Tile(磁贴)
- 微信原图泄露的只能是 Exif ,你的隐私不在这!!!
- Namenode启动报错Operation category JOURNAL is not supported in state standby
- org.apache.commons.httpclient工具类
- 安装pandas时出现环境错误
- Nestjs 上传文件
- JS打开新窗口防止被浏览器阻止的方法
- cropper实现基本的裁剪图片并上传
- C#的委托与Java的自定义接口的异曲同工的同步操作
- C# 多线程七之Parallel
- PTA (Advanced Level) 1004 Counting Leaves
- 1.Qt简介
- python之jsonpath的使用
热门文章
- sql中decode()重要函数使用
- N皇后问题算法
- BZOJ2328: [HNOI2011]赛车游戏
- 关于LCD的duty与bias
- luoguP3066 [USACO12DEC]逃跑的BarnRunning
- C# HttpRequest
- Linux之make的用法讲解
- 调用jersey发布的接口webservice,通过HttpPost传递文件
- sping junit test
- Could not find JSON in http://updates.jenkins-ci.org/update-center.json?id=default&;version=2.7.4