Git Workflow

Contributions to the Boost Unit Test Adapter ETAS repository are always welcome. We do have some recommendations that we suggest collaborators follow in order to facilitate administration.

Branching

After forking the project, changes are ideally maintained in a branch separate from the master branch. There are no branch name conventions in effect but it is recommended that the branch name reflects the feature/fix which it tackles.

Prior to pushing your changes onto your fork in preparation of a pull-request, squash your commits into one and publish a pull-request with the branch consisting of a single commit. Preferably, pull-request branches originate from the HEAD of the master branch. If the master branch has changed whilst in development of a fix/feature, rebase accordingly. For further explanation regarding the rebase-squash process, please refer to https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request.