FAQ

How do I update my branch?

See below. Don't include the $ in your commands.

$ git status # make sure you dont have any uncommitted changes
$ git checkout dev
$ git pull origin dev
$ git checkout <your branch>
$ git rebase dev
$ git push origin <your branch> --force

When I do git pull origin dev I see errors. Help!

To fix this, first make sure you are on the dev branch. Run the commands below:

$ git fetch origin dev
$ git reset --hard origin/dev
# continue with the git checkout <your branch> step above

How do I check if my branch is up to date?

1. Navigate to the Core-v4 homepage
2. Select your branch from the dropdown menu below:

3. If you see x commits behind dev like below, you need you run the steps to update your branch above.

A test failed. How can I find the problem?

1. A failed test case often looks like below:

2. That isn't the actual error. Scroll up you'll find the real issue with the test.

Module not found. Help!

You are missing a dependency. Install it with npm install && npm run server-install.

Can't resolve '../../config/config'. What do I do??

You need to run python setup.py to generate this file.

How do I squash commits?

1. Type this command

$ git rebase -i dev

2. Here, a text editor should pop up. Change all but the top pick keyword to s to squash your commits. An example of this file is shown below.

3. Save the file. There may or may not be merge conflicts for you to resolve. Once the conflicts are resolved and the branch is done rebasing, force push to origin.

$ git push origin <your branch> --force