Skip to content

FAQ

Jump to bottom
Evan Ugarte edited this page Dec 7, 2021 · 21 revisions

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:

dropdown

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

image

A test failed. How can I find the problem?

  1. A failed test case often looks like below: image

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

Help I'm getting this Module not found error!

image

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

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

image

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

How do I squash commits?

  1. Type this command
$ git rebase -i dev

  1. Here, a text editor (typically vim) should pop up.

    Small lesson on vim: press i to enter insert mode (normal document editing) and press esc to enter command mode. To edit the text, press i and use the arrow keys to navigate around and backspace to delete characters. To save your work, you need to go back to command mode by pressing esc. Then, type :wq to save the editor. A small cheatsheet can be found here

    Change all but the top pick keyword to s to squash your commits. An example of this file is shown below.

  2. 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

Travis failed! What happened?

Option 1

Your code is bad

Option 2

This is a TravisCI problem. Just click on the details to view more details on the build. Then, click on the build and then restart build. Screenshots can be seen below.

  1. Click the build here
    the build
  2. Click restart build here
    restart build

How do I review a Dependabot PR?

If it fails travis, rerun the travis test and it if fails again, close the PR. Otherwise:

  1. git fetch
  2. git checkout dependabot/<dependabot branch>
  3. delete node_modules/
  4. npm install
  5. Run the website using these commands (in separate terminals) or clicky for more information 
    npm run server
npm start
mongod
  6. If the website pops up without an issue, approve. Otherwise, make a comment with a screenshot on the error.
Clone this wiki locally