git-stash

I have my local repo in a state that forbid me to either commit, stash, checkout to another branch or even discard changes . So I'm just stuck. I will try to describe what steps brought me to this situation, as far as I remember. Please, take a seat. A not so long time ago, in another computer far, far away... an other dev normalized crlf in the project according to: https://help.github.com/articles/dealing-with-line-endings In the while (you know, speed of light...) I made some changes locally, commited, and pulled. When I pulled Git said: error: Your local changes to the following files

I'm very new to git and have some question about stashing. If I've worked on a branch but was not able to get to a position where I can commit the branch, stashing is the right thing to use. My questions regarding stashing are: How many stashes are saved? How long are these stashes saved? Do they just temporarily save the work such that the changes are lost when you reboot your computer? If someone could quickly help clarifying these would be really appreciated. jub0bs 1 - How many stashes are saved? Stashes don't appear out of thin air; only if you create them, using git stash or,

A Git repository has been cloned on several developers' local machines. Some changes have been made to the code in the repository. We're now getting the error: error: Your local changes to the following files would be overwritten by merge: public_html/sites/file public_html/sites/file1.txt public_html/sites/file2.txt Please, commit your changes or stash them before you can merge. Aborting I've read quite a few threads online, and several different options have been suggested. One approach was run: git stash git pull git stash pop I think I understand the basic principle of stashing. My

I went into a branch and did some work. I wanted to go into another branch but didn't want to commit so I did git stash . Then I did git checkout <otherbranch> . I did some work there and, just like in the first branch, I wanted to switch out of it before committing the work. So I did git stash there too. I switched back to the first branch and tried to unstash it ( git stash pop ) thinking it would get the stash from that specific branch. I was surprised that it unstashed the stash from <otherbranch> (latest stashed). I was under the impression that stash is branch-specific but this behavior

I can't pop my stash because I merged a branch which apparently conflicts with my stash and now my stash is seemingly unable to be popped. app.coffee: needs merge unable to refresh index Anyone know how to resolve this? FIXED! Turns out the actual issue was an unresolved merge conflict from the merge, NOT that the stash would cause a merge conflict. Resolution: Commit the conflicted file. First, check git status . As the OP mentions, The actual issue was an unresolved merge conflict from the merge, NOT that the stash would cause a merge conflict. That is where git status would mention that

I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch. What I want is a way to merge my stashed changes with the current changes. Is there a way to do this? Its more for convenience, I eventually gave up and committed first my current changes, then my stashed changes, but I would have preferred to get them in with one fell swoop. Joshua Warner I just discovered that if your uncommitted changes are added to the index (i.e. "staged", using git add ... ), then git stash apply (and, presumably, git stash pop ) will actually do a proper