Welcome to Toy Problems. This repository will be updated every morning with a new code challenge.

You'll find each day's toy problem in its own folder.

If you haven't already, fork the repository on GitHub and clone your newly created repo down to your computer.

Once you're done, push your changes to GitHub and issue a pull request from your repository's master branch to your hackreactor branch.

Every morning, when a new toy problem is added, you'll need to sync your version of the repo with hackreactor's. Git won't automatically pull in upstream changes for you; it trusts that you'll pull them in as needed. Do so by giving Git a reference to hackreactor's version of the repo:

git remote add upstream https://github.com/hackreactor/2015-03-toy-problems.git

After you've done that, updating your repo is as simple as running the following:

git checkout master       // Your fork's master branch
git pull upstream master  // Your class's master branch

This will check out your branch and tell git to grab any changes made to the main repository and merge them into your branch.

You may encounter a scenario where Taser will not merge your pull request. This often happens as a result of your upstream branch becoming out of sync with your local copy. To resolve this problem, run:

git pull upstream <your-branch-name>

Resolve any conflicts, merge, commit and push. You will then be able to submit a Pull Request that will get correctly merged.