A working git workflow