Yeah we have the same approach, but with one difference. Everyone has their own fork of the repo (The reason for this is we had a few avoidable conflict issues)

Yeah we have the same approach, but with one difference. Everyone has their own fork of the repo (The reason for this is we had a few avoidable conflict issues). But yes, master should always be deployable, and can only be merged once all tests have past (we use Jenkins).. And you are never, ever allowed to merge your own code (no matter how small it is)