Comment by whatagreatboy

How much time do you spend resolving merge conflicts between multiple team members?