vue and react prototypes working

ITISFoundation / osparc-lab

sim-core technology and concept review

5 stars 8 forks source link

Closed odeimaiz closed 7 years ago

oetiker commented 7 years ago

In general I would suggest to always work with local branches and create a PR from the branch.

Then once the PR is merged, git pull upstream master to get your local master updated

odeimaiz commented 7 years ago

Hi @oetiker, That means that the first part is correct but I'm still missing the second part of doing the git pull upstream master, right? https://help.github.com/articles/syncing-a-fork/

oetiker commented 7 years ago

No your PR was from your own :master ... you should have created a branch first

git checkout master
git pull upstream master
git checkout -b my-cool-feature
... develop ...
git commit ...
git push

you have to configure the main repo as your 'upstream' ... this does not happen automatically