Muri Nicanor:
> thats what i get when mergin you branch:
> https://share.riseup.net/#dCKce91OfBDeAX2yd26kAA
> by now i'm not sure anymore if its maybe my master branch which is
> broken...? maybe someone could take a look who has more git knowledge?
Maybe your branch was based on feature/jessie?
For example:
$ git diff origin/master...spriver/de_persistence config/base_branch
diff --git a/config/base_branch b/config/base_branch
index 2bf5ad0..0d639f2 100644
--- a/config/base_branch
+++ b/config/base_branch
@@ -1 +1 @@
-stable
+feature/jessie
