Repository navigation

Git Basics

Jump to bottom Edit New page

Robin edited this page Feb 21, 2014 · 4 revisions

Updating our fork

with latest wocommunity/wonder patches

Only the first time when you checked out our fork

Open Terminal on Mac or command line on *NIX, Win. Change directory into the fork

git remote add upstream https://github.com/wocommunity/wonder.git
git remote -v

Update procedure

Open Terminal on Mac or command line on *NIX, Win. Change directory into the fork

git fetch upstream
git checkout master
git merge upstream/master
git mergetool (optional, when encountering conflicts)

Open GitHub App commit and sync