Skip to main content
7 events
when toggle format what by license comment
Dec 31, 2019 at 13:10 comment added Vicente Antonio G. Reyes 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.
Mar 4, 2019 at 5:41 comment added Bal Krishna Jha Thank you very much. git stash and git stash pop part very helpful
Jan 26, 2018 at 21:02 comment added Brad Ellis 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
Jun 26, 2017 at 14:44 comment added Wolf 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 ?
Dec 9, 2016 at 13:53 history edited Benny Code CC BY-SA 3.0
added 5 characters in body
Mar 16, 2016 at 12:31 history edited Emil Laine CC BY-SA 3.0
format code blocks
Mar 16, 2016 at 12:24 history answered Benny Code CC BY-SA 3.0