ah, maybe a sane git workflow now?