Going with the (Git) flow