-
Notifications
You must be signed in to change notification settings - Fork 14
Getting up to date with master
Adam Ginsburg edited this page May 14, 2015
·
9 revisions
To get your local copy of "frontend" up to date, do the following:
- Check that your remotes are set up correctly. Should look like this:
$ git remote -v
origin [email protected]:adamginsburg/frontend.git (fetch)
origin [email protected]:adamginsburg/frontend.git (push)
upstream [email protected]:camelot-project/frontend.git (fetch)
upstream [email protected]:camelot-project/frontend.git (push)
- Check what branch you're on:
$ git branch
feature_branch
* master
If you only have one branch, that's OK, but any changes you make should go on a different branch when possible (see below). You should be on master now (there should be a * next to master)
- "Pull" the changes from master
$ git pull upstream master
From github.com:camelot-project/frontend
* branch master -> FETCH_HEAD
Already up-to-date.