3. Workflow

Branches

The master branch is the most-stable branch that will be used to deploy the website. DO NOT PUSH ANYTHING TO THIS BRANCH until we are finished with this project.

The develop branch is the development branch, where we will push and pull commits from. This is will contain the latest version that is developed so far.

Workflow

If you are working on a task, pull from the develop branch, and create a new branch from the develop branch. Once you are finished with the task, you can push the branch into the remote repository. A new branch will be created in the remote repository. If you want to merge to the develop branch, create a pull request for your branch.

Rebase

1. git checkout develop
2. git pull
3. git checkout [your-branch]
4. git rebase develop