Skip to content

Workflow

arunlakshmanan edited this page Oct 1, 2016 · 1 revision

Since we will be using git extensively it is recommended that you learn the basics. This tutorial is will take you 15 mins and should cover everything from creating git repos to branching and merging.

Git workflow

There are two main branches:

  • master: For fully tested and documented features.
  • develop: For partially tested but completed features.

Whenever you are developing new code branch from develop and create a new branch with the name: feature/my-new-feature.

## For creating a new feature branch:
git checkout develop
git checkout -b feature/distributed-control
### Now continue working here

Once you have complete working on the feature branch, you can merge your code with develop and continue testing. After you complete documentation and record the features and bugs in the wiki, you can create a pull request to merge your code with master.

Coding style

We will use Crazyflie coding standard for consistency purposes. You can find it here.

Clone this wiki locally