The simple solution is to not have multiple team members working on the same branch. Branches should be pretty ephemeral.