---
# System prepended metadata

title: GIT stuff

---

# GIT stuff

## current
```
master
|
\
|\feature branch
| * feature commit
|/
/* feature merge commit (no-ff)/tag staging
|
|* hotfix/tag production
```

## Plan

### Git flow
![](https://leanpub.com/site_images/git-flow/git-flow-nvie.png)

Limitations/rules:
* keep rebasing feature branches before merging to develop
* manual merges of release branch to develop and master
* Decide with Michi when and what the release branch should contain

Changes to drone.yml:
* release on tag on master
* automatic deployment of release branch to staging
