CONTRIBUTING.md

Contributing

All pull requests should be based off the develop branch.

The Calabash Toolchain uses git-flow.

See these links for information about git-flow and git best practices.

Git Flow Step-by-Step guide

• https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

Git Best Practices

• http://justinhileman.info/article/changing-history/

git-flow command line tool

We don't use the git-flow tools, but this is useful anyway.

• http://danielkummer.github.io/git-flow-cheatsheet/

Start a Feature

Start your work on a feature branch based off develop.

# If you don't already have the develop branch
$ git fetch origin
$ git co -t origin/develop

# If you already have the develop branch
$ git co develop
$ git pull origin develop
$ git co -b feature/my-new-feature

# Publish your branch and make a pull-request on `develop`
$ git push -u origin feature/my-new-feature