Git

Git guidelines for this project

Edit: Let it be known that the Spring 2019 team did not follow these guidelines. We just committed everything to master. Sorry not sorry.

If your issue pertains to changes to the codebase, try to only checkout one issue at a time or only issues on either the frontend or the backend.

First, make sure your local git is up-to-date. Run git pull to pull any changes from the remote repository.

<name>-<feature/issue>-<side>

Example: jonny-create-post-backend

Create a new branch by running git branch <branch_name>.

You'll notice (master) in your terminal. Run git checkout <branch_name> to select the branch you just created.

Now you work on the issue for that branch until it is complete, and then request a merge to the master branch after your code is tested.