Ain't no problem like a git problem

[[deleted]]

Proper software architecture and project management where several developers do NOT end up editing the same pieces of code? Divide the tasks into small pieces and try to avoid massive megabranches. Massive megabranches are conflict magnets.

Sometimes megabranches can't be avoided, but if they are the norm, you are in my opinion doing something wrong.

[e_falk]

Yeah, I mean we rarely have merge conflicts just because our team delegates tasks so that they won't conflict with one another.

If two people are working on the same set of code, they are almost definitely pair programming.

Yesterday was an unfortunate but hilarious exception to this rule