Commit 2fb72b2a authored by thomas.forbriger's avatar thomas.forbriger

master [TASK]: introduce new branch master-with-examples

parent 789f4119
......@@ -61,7 +61,10 @@ Source code is provided on branch `vendor`.
just before next vendor snapshot
`vendor`: vendor import branch (just code, no example data)
`vendor-with-examples`: vendor import with data file examples
`master`: will point to `vendor`
`master`: is a child of `vendor` (additionally contains local
modifications and additions)
`master-with-examples`: is a child of `vendor-with-examples` (additionally
contains local modifications and additions)
`workbench`: separate branch providing tools for vendor imports
### merge hierarchy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment