Skip to content

Home

Jump to bottom
Joe Rezendes edited this page Dec 18, 2018 · 8 revisions

Welcome to the Skedge wiki!

This will mainly go over some organizational flow.

Branch system

We will have the following Branches:

Master

The master branch will be the live version on https://www.skedge.io/

Develop

The develop branch will contain feature branches for a specific planned release. The develop branch will merge into master.

FeatureName

Each individual feature should have it's own branch that will merge into develop.

You should do the following before QA/Review/Merging into Develop.

  1. Pull the develop branch into your feature branch and resolve any merge conflicts
  2. Do a final check to make sure nothing is broken or out of the ordinary.

FeatureName Branches off master

If there's a specific issue that doesn't belong to any specific planned release, please create a branch off of master.

If there are doubts about if your feature belongs to a specifically planned release, then create it off of master as a default instead of develop.

Before we merge your feature branch to master, make sure you pull the master branch back into your feature branch and check again that everything is working correctly.

Project Board

The following are some definitions:

  • Backlog: These are issues anyone can take.
  • In progress: You are working on this issue.
  • Ready: This issue is ready for Review/QA/Merge.
  • Done: This issue is shipped to production.
Clone this wiki locally