Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include how-to-update section #6474

Merged
merged 4 commits into from
Nov 27, 2019
Merged

Include how-to-update section #6474

merged 4 commits into from
Nov 27, 2019

Conversation

hamoid
Copy link
Contributor

@hamoid hamoid commented Nov 26, 2019

Also minor headline formatting to make sections more obvious.

Also minor headline formatting to make sections more obvious.
@roymacdonald
Copy link
Contributor

Hi, Thanks for this.
If anyone is using the github version I assumes that the user has fork and changed the remotes to point to its own fork, which is what you would do in order to make pull requests.
So, I would add to check

git remote -v

and see that which is the remote that is pointing to the openFrameworks github repo, and pull on that. For example, if I call this command I get the following:

origin	git@github.com:roymacdonald/openFrameworks.git (fetch)
origin	git@github.com:roymacdonald/openFrameworks.git (push)
upstream	https://github.com/openframeworks/openFrameworks.git (fetch)
upstream	https://github.com/openframeworks/openFrameworks.git (push)

Thus, it is the upstream remote which is pointing to OF's github repo, and it is from which I need to pull. In order to do so I need to call

git pull upstream master

The download dependencies is not absolutely mandatory, it is only needed when a dependency has been updated, which does not happen often, so I would add that this should be done if the local repo has not been updated in a long time.

@hamoid
Copy link
Contributor Author

hamoid commented Nov 26, 2019

Good point @roymacdonald , I'll update it.

@hamoid
Copy link
Contributor Author

hamoid commented Nov 26, 2019

Better now @roymacdonald ?

@roymacdonald
Copy link
Contributor

Hi. sure, sorry to bother, but I would explicitly add how to add the other remote as it is super easy.

git remote add upstream git@github.com:openframeworks/openFrameworks.git

in which upstream can be any name that is not already used for a remote, thus listed on the git remote -v command

to update the project generator it is better to call git submodule update --recursive

Add info about adding upstream in git
@hamoid
Copy link
Contributor Author

hamoid commented Nov 26, 2019

Updated.

@roymacdonald
Copy link
Contributor

Great! looks good to me.

@roymacdonald
Copy link
Contributor

thanks


```bash
git pull upstream master
git submodule update --recursive
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran into this recently.
If you haven't pulled in the submodules you have to do this first:
git submodule update --init --recursive

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added :)

Mention how to --init submodules if never did
@arturoc arturoc merged commit fcad6b0 into openframeworks:master Nov 27, 2019
@arturoc
Copy link
Member

arturoc commented Nov 27, 2019

thanks!

@hamoid hamoid deleted the patch-4 branch November 27, 2019 15:04
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