Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

3
  • 2
    Dosn't work: I get still the same message like "stash your changes first". When I type "git stash" and then "git pull" -> "error: you have unsaved changes.. do a stash first". Short before destroying my computer Commented Jan 21, 2018 at 14:19
  • @trinity420 Could it be your file permissions, check git status what changes do you have after stashing. If none answer helps, consider adding a new question. Commented Jan 21, 2018 at 14:40
  • thank you but my problem solved, tried everything on here, nothing worked, then clicked "commit changes" "merge" in PHPStorm and then I unstashed changes and it worked.. Commented Jan 21, 2018 at 15:52