Ok, i got it. I needed to use the default Makefile and i needed to do a full wipe of all things i have done.
cd tinyg (root directory of the git repo)
git rm -r –cached *
git reset –hard
cd firmware/tinyg/default
make all
Now i can compile master/edge and dev branch.
Maybe this is useful for someone who tries this himself. 😉