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.

4
  • 1
    Helped partly: Is git remote add upstream [email protected]:original_author/project_name.git just an alias for git remote add upstream https://github.com/original_author/project_name.git ?
    – Wolf
    Commented Jun 26, 2017 at 14:44
  • 2
    Wolf, guessing you know this by now, but for posterity... It is the format for ssh. help.github.com/articles/configuring-a-remote-for-a-fork
    – Brad Ellis
    Commented Jan 26, 2018 at 21:02
  • 2
    Thank you very much. git stash and git stash pop part very helpful Commented Mar 4, 2019 at 5:41
  • This worked. After git merge upstream/master, auto merge failed due to unmerged paths which I had to run git add -A then git commit -m "message" then it was up to date. Commented Dec 31, 2019 at 13:10