Git Basics - AppWonder/wonder GitHub Wiki

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

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

Update procedure

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

  1. git fetch upstream
  2. git checkout master
  3. git merge upstream/master
  4. git mergetool (optional, when encountering conflicts)

Open GitHub App commit and sync