Ident: Created page with "== Merging == * The main branches currently have to be merged in this direction: '''v0-8 --> v0 --> default''' * If you push v0 or v0-8 changes and you are done with this bra..."

2016-08-21T21:34:54Z

Created page with "== Merging == * The main branches currently have to be merged in this direction: '''v0-8 --> v0 --> default''' * If you push v0 or v0-8 changes and you are done with this bra..."

New page

== Merging ==

* The main branches currently have to be merged in this direction: '''v0-8 --> v0 --> default'''
* If you push v0 or v0-8 changes and you are done with this branch for today, you must also merge upwards to v0 and default. This ensures that there won't be a backlog of merges piling up that would make it very hard for the next one to do this.
* If you push a change to the default branch and are doen with the branch for today, you have to first make sure you merged all changes from v0-8 to v0 and from v0 to default branch.

General Guidelines - Revision history

Ident: Created page with "== Merging == * The main branches currently have to be merged in this direction: '''v0-8 --> v0 --> default''' * If you push v0 or v0-8 changes and you are done with this bra..."