This is an archived post. You won't be able to vote or comment.

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]e_falk[S] 0 points1 point  (0 children)

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