Friday, November 22, 2013

Pulling from upstream and updating the master

I always forget how to do this. Use something like

git remote add upstream

to add the upstream version. Now,

git fetch upstream -v

that's -v for verbose. This should bring in any new branches:

Tims-MacBook-Air:MvvmCross-SQLite tim$ git fetch upstream -v
remote: Counting objects: 123, done.
remote: Compressing objects: 100% (60/60), done.
remote: Total 98 (delta 62), reused 63 (delta 33)
Unpacking objects: 100% (98/98), done.
 * [new branch]      create-experiments -> upstream/create-experiments
 * [new branch]      master     -> upstream/master
 * [new tag]         3.0.13     -> 3.0.13

Now, carefully, make sure you are on the right branch.

Tims-MacBook-Air:MvvmCross-SQLite tim$ git branch
* wm
Tims-MacBook-Air:MvvmCross-SQLite tim$ git checkout master
Switched to branch 'master'

Now it is safe to merge upstream using

git merge upstream/master

When this done go to your dirty branch, and merge from master to get the latest. You will need to push both to the repo. If the branch is not upstream, you may need

git push --set-upstream origin yourbranch

No comments:

Post a Comment