I\'m working for some time with an - exclusively local - branch dev by standard rebasing on an organisations remote master branch:
dev
master
o