From a2a44cefaa5514c32b7b1927ae6df2175d729bd4 Mon Sep 17 00:00:00 2001 From: Conrad Date: Wed, 18 Dec 2019 14:36:59 +0100 Subject: [PATCH] Minor README update --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 69598fe..e919052 100644 --- a/README.md +++ b/README.md @@ -7,16 +7,17 @@ For the user manual see `docs/manual.pdf` - `src` - Source Code - `docs` - Documentation of the source code and user manual - `Examples` - Temporary folder for example pictures -- `Abgabe` - Files that were submitted +- `Abgabe` - Files that were submitted prior to the development start ## Pesentations -- 0.3 https://prezi.com/view/M593VBJhmfwQzuqt3t6f/ +- since `0.3`: https://prezi.com/view/M593VBJhmfwQzuqt3t6f/ ## Branching - `master` branch: current state of the program, pull requests only by maintainers or developers - `dev` branch: state of development for next week, will be merged every Thursday, pushable for maintainers, pull requests for everyone - `dev-X` branches: feature development branches which will be merged into dev, when tested +- `hotfix-X` branches: braches to fix small but important bugs, will be merged into master and dev -Every Thursday dev and master will be merged and tagged with the current version. +On Thursday the development state (`dev`) will be merged into master and tagged with the current version.