I am a single developer right now, but I do have a workplace, and I also do work at home. Github is pretty ideal for me because the goal is to track my code, but also just keep it in a good repository so I don't lose it. So here is my work process... <ul> <li>Do work at home (<code>site a</code>)</li> <li>commit changes to github frequently <ul> <li>sometimes, this will be up to 20 commits in a day, depending on productivity. I commit often.</li> </ul> </li> <li>go to other work <code>site b</code> (usually office)</li> <li>clone repository at <code>site b</code> <ul> <li>this is done within visual studio, by going to <code>Team Explorer</code> -> <code>Projects</code> -> <code>Connect to Team Projects</code>, and then using <code>Clone</code> with the github repository URL.</li> </ul> </li> </ul> <img src="https://i.stack.imgur.com/p0ISB.jpg" alt="clone"> <ul> <li>redownload nuget packages, etc - resume work as normal at <code>site b</code> for the day <ul> <li>I perform frequent commits here, as well.</li> </ul> </li> <li>return home (<code>site a</code>) and open up Visual Studio 2013 </li> <li>open up the project I was working on</li> <li>go to <code>Team Explorer</code> -> <code>Unsynched Commits</code> and click <code>Pull</code> </li> </ul> <img src="https://i.stack.imgur.com/DyRSj.jpg" alt="pull"> <ul> <li>sometimes it works</li> <li>sometimes, however, I receive the following error and I have no idea why </li> </ul> <img src="https://i.stack.imgur.com/6srbr.jpg" alt="error"> I would understand this if I had made edits to the current project before trying to pull - but I haven't. All I've done is loaded up Visual Studio. It says "See the Output window for details" but the Output window is completely blank - there are no details, and in this situation the only answer I've found is to delete the WHOLE project from my computer and clone the entire repository again. Certainly this isn't right, I'm a complete newbie to git, and I have read the documentation over and over and this still makes no sense to me. Can anyone help shed some light on any of this?

Before <code>pull</code>-ing you need to <code>stash</code> your uncommitted changes first. Visual Studio does not support full range of Git functionality yet, including <code>git stash</code>, so you have to do it through command line or use something like Source Tree in addition to Visual Studio for such occasion. Run <code>git status -u</code> to see uncommitted changes and <code>git stash</code> to temporarily hide them before pulling/syncing. Once in a while Visual Studio will cache the status results and will get out of sync with reality, in this case kill Studio, delete <code>.git\ms-persist.xml</code> file and restart.

github with Visual Studio 2013 - cannot pull because of uncommitted changes

I am a single developer right now, but I do have a workplace, and I also do work at home. Github is pretty ideal for me because the goal is to track my code, but also just keep it in a good repository so I don't lose it. So here is my work process...

Do work at home (site a)
commit changes to github frequently
- sometimes, this will be up to 20 commits in a day, depending on productivity. I commit often.
go to other work site b (usually office)
clone repository at site b
- this is done within visual studio, by going to Team Explorer -> Projects -> Connect to Team Projects, and then using Clone with the github repository URL.

clone

redownload nuget packages, etc - resume work as normal at site b for the day
- I perform frequent commits here, as well.
return home (site a) and open up Visual Studio 2013
open up the project I was working on
go to Team Explorer -> Unsynched Commits and click Pull

pull

sometimes it works
sometimes, however, I receive the following error and I have no idea why

error

I would understand this if I had made edits to the current project before trying to pull - but I haven't. All I've done is loaded up Visual Studio. It says "See the Output window for details" but the Output window is completely blank - there are no details, and in this situation the only answer I've found is to delete the WHOLE project from my computer and clone the entire repository again.

Certainly this isn't right, I'm a complete newbie to git, and I have read the documentation over and over and this still makes no sense to me. Can anyone help shed some light on any of this?

Can you git pull with uncommitted changes?

When your uncommitted changes are significant to you, there are two options. You can commit them and then perform git pull , or you can stash them.

How do I see uncommitted changes in Visual Studio code?

Right-click your project suite in the Project Explorer and then click Source Control > Show Changes.

Does git push push uncommitted changes?

Git push command does it. These changes represent commitments performed on the repository and not the uncommitted changes (if any).

Before pull-ing you need to stash your uncommitted changes first. Visual Studio does not support full range of Git functionality yet, including git stash, so you have to do it through command line or use something like Source Tree in addition to Visual Studio for such occasion. Run git status -u to see uncommitted changes and git stash to temporarily hide them before pulling/syncing. Once in a while Visual Studio will cache the status results and will get out of sync with reality, in this case kill Studio, delete .git\ms-persist.xml file and restart.

github with Visual Studio 2013 - cannot pull because of uncommitted changes

Tags:

git

visual-studio-2013

Ciel

People also ask

1 Answers

Ilya Kozhevnikov

Recent Activity

Donate For Us

github with Visual Studio 2013 - cannot pull because of uncommitted changes

Tags:

git

visual-studio-2013

Ciel

People also ask

1 Answers

Ilya Kozhevnikov

Related questions

Recent Activity

Donate For Us