Yeah it used to happen all the time, we'd get weird merge errors and have to talk people through fixing their branches (sometimes losing the person in the process through sheer frustration)
Master is now just a README pointing to the instructions for develop. Hopefully works for us better.
no subject
Yeah it used to happen all the time, we'd get weird merge errors and have to talk people through fixing their branches (sometimes losing the person in the process through sheer frustration)
Master is now just a README pointing to the instructions for develop. Hopefully works for us better.