Project

General

Profile

Git Workflow » History » Version 3

Alexander Watzinger, 2018-12-25 16:56

1 1 Alexander Watzinger
h1. Git Workflow
2
3
We are using "git":https://git-scm.com/ as a versioning system using the "Git Branching Workflows":https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows
4
5
The main branches are:
6
7
* *master* - the stable version used in productive environments. It is the latest release version which is tested and, to our knowledge, bugfree.
8
* *develop* - here the latest development branches are joined when they are finished. At a release the develop branch is merged into the master branch.
9
10 2 Alexander Watzinger
The branches in which the work (in progress) is happening have following prefixes:
11 1 Alexander Watzinger
12
* *feature_* - e.g. feature_user_profile_images
13
* *fix_* - e.g. fix_map_bug
14
15 3 Alexander Watzinger
When work on these branches is finished they are merged into the *develop* branch. Around once a month a new version is released where the *develop* branch is merged into the *master* branch.
16 1 Alexander Watzinger
17
So when working on a new feature it's a good workflow to begin from the *develop* branch at the beginning and after that merge it regulary while working to keep merge conflicts to a minimum. 
18
19
There may be some other prefixed branches which won't be merged:
20
21
* *try_* - if something was tried out and put aside for the moment but will maybe picked up later
22
* *test_* - special versions that are used to test specific scenarios