Skip to content

I am still not sure if I am doing this right.#63

Open
noahcoleman wants to merge 20 commits intoSAIC-ATS:masterfrom
noahcoleman:master
Open

I am still not sure if I am doing this right.#63
noahcoleman wants to merge 20 commits intoSAIC-ATS:masterfrom
noahcoleman:master

Conversation

@noahcoleman
Copy link
Copy Markdown
Member

Merging some of the stuff I've been working on.

  • controlling servos thru oF
  • arduino code for aforementioned servos
  • a smattering of coding misadventures

@bakercp
Copy link
Copy Markdown
Member

bakercp commented Sep 29, 2013

First, git pull upstream master.

Then please remove all .DS_Store files and *.app folders. Also, please move or remove Arduino/WhatHathGodWroughtBlink/WhatHathGodWroughtBlink.ino. It looks like you also have a copy in your own folder already ... ?

@noahcoleman
Copy link
Copy Markdown
Member Author

I'm sorry, I'm still fuzzy on a lot of this...everything. When I tried to git pull upstream master, the terminal says

Macintosh-c82a14209b46:ExperimentalMedia Noah$ git pull upstream master
fatal: 'upstream' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

I feel like I'm riding the short bus to coding school.

@mikewesthad
Copy link
Copy Markdown
Contributor

Hey @noahcoleman, it sounds like your remote repository "upstream" was never set. If you want to verify that, try "git remote -v" which prints out what remote repos you have linked to your local repo. You should probably just see two lines that start with the word "origin" and that have links to your git repo (../noahcoleman/ExperimentalMedia.git).

If you want to add a link to the original repository (the one that you forked from), use this command:
"git remote add upstream https://github.com/bakercp/ExperimentalMedia.git" Now, when you type in "upstream," git will understand what repo you are referring to, so then you should be able to perform the pull command.

@noahcoleman
Copy link
Copy Markdown
Member Author

Thank you @mikewesthad. That worked. I really appreciate your help.

@tobiaszehntner
Copy link
Copy Markdown

didn't know the 'git remote -v' command, very practical. thanks mike!

On 28 Sep 2013, at 21:50, Michael Hadley notifications@github.com wrote:

Hey @noahcoleman, it sounds like your remote repository "upstream" was never set. If you want to verify that, try "git remote -v" which prints out what remote repos you have linked to your local repo. You should probably just see two lines that start with the word "origin" and that have links to your git repo (../noahcoleman/ExperimentalMedia.git).

If you want to add a link to the original repository (the one that you forked from), use this command:
"git remote add upstream https://github.com/bakercp/ExperimentalMedia.git" Now, when you type in "upstream," git will understand what repo you are referring to, so then you should be able to perform the pull command.


Reply to this email directly or view it on GitHub.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants