Overview

If you plan to write a Pull Request for Free Code Camp, you will almost certainly need a local copy of the site. Having a local copy of the site will give you additional capability with Git that are not available via the GitHub browser interface, including updating your fork and rebasing/squashing commits.

This guide will cover how to fork the FCC project, clone a local copy, and how to maintain your fork. All Git commands will be given for the command line, which we strongly recommend that you use, but most commands can be executed in a graphical Git environment as well.

Need Help?

Free Code Camp Issue Mods and staff are on hand to assist with Pull Request related issues on our Help Contributors Chat Room

Initial Setup

Setting Up your System

Install Git or your favorite Git client
(Optional) Setup an SSH Key for Github.
Using SSH can greatly speed up your interactions with GitHub, since you will not be prompted for your password.
Create a parent projects directory on your system. For the purposes of this document we will assume it is /mean/

Forking Free Code Camp

Navigate to the top level Free Code Camp repository:
https://github.com/FreeCodeCamp/freecodecamp
Click the "Fork" Button in the upper right hand corner of the interface. More Details Here.
After the project is forked, you will be taken to your copy of the FCC repo at username/freecodecamp

Cloning Your Fork

From your fork of FCC, copy the HTTPS or SSH (if you installed SSH Keys) clone URL
Open a Bash Shell/Command Line/Terminal to your projects directory (IE: /mean/)
Clone your fork of git:
git clone https://github.com/yourUserName/FreeCodeCamp.git
This will download the entire FCC repo to your projects directory.

    $ git clone https://github.com/yourUserName/FreeCodeCamp.git
    Cloning into 'FreeCodeCamp'...
    remote: Counting objects: 37294, done.
    remote: Compressing objects: 100% (13/13), done.
    remote: Total 37294 (delta 5), reused 0 (delta 0), pack-reused 37281
    Receiving objects: 100% (37294/37294), 18.69 MiB | 3.99 MiB/s, done.
    Resolving deltas: 100% (26053/26053), done.
    Checking connectivity... done.
    Checking out files: 100% (573/573), done.

Setting up your Upstream

Change directory to the new FreeCodeCamp directory
Add a remote to the official FCC repo:
git remote add upstream https://github.com/FreeCodeCamp/FreeCodeCamp.git

Congratulations, you now have a local copy of the FCC repo!

Maintaining your Fork

Now that you have a copy of your fork, there is work you will need to do to keep it current.

Rebasing from Upstream

Do this every time prior to creating a branch for a PR:

Make sure you are in the staging branch

$ git status
On branch staging
Your branch is up-to-date with 'origin/staging'.

If you are not on staging, resolve any outstanding files/commits and checkout staging
git checkout staging
Do a pull with rebase against upstream
git pull --rebase upstream staging
This will pull down all of the changes on the official staging without making an additional commit in your local repo.
(Optional) Force push your updated staging to your GitHub fork
git push origin staging --force This will overwrite the staging branch on your fork.

$ git push origin staging --force
Counting objects: 99, done.
Delta compression using up to 12 threads.
Compressing objects: 100% (38/38), done.
Writing objects: 100% (38/38), 16.14 KiB | 0 bytes/s, done.
Total 38 (delta 25), reused 0 (delta 0)
To git@github.com:yourUserName/FreeCodeCamp.git
   f7a525c..8a2271d  staging -> staging

FreeCodeCamp/wiki