I use gitlab and follow a modified gitflow branching scheme. When I work with other developers, we do everything possible to plan work such that we avoid working in the same files/scripts at the same time. Otherwise, deployment for testing just gets too hairy as we're constantly stepping on each other.