Merging your fork upstream

First time Set Up & Sync

• Open finder to the folder that contains your project
• At the bottom of the finder window is the path to the folder
• now open terminal and type cd followed by the path to that directory (starting after your username)

Below is what I would type if my project was in in Projects/design-manual:

cd Projects/design-manual

• Now we need to set up git to track the original remote branch

git remote add upstream [email protected]:cfpb/design-manual.git

Now merge the original repo with your local code

git fetch upstream
git merge upstream/gh-pages

That should sync your local branch with the main repo!

Syncing

After doing the above you can ommit the second step. From now on:

cd Projects/design-manual
git fetch upstream
git merge upstream/gh-pages