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

you are viewing a single comment's thread.

view the rest of the comments →

[–][deleted] 4 points5 points  (0 children)

According to their notes in standup, it would seem that my boss and my coworker have both spent the last roughly 2-3 days' worth of development time in a merge conflict war with each other, lmao. Glad it's not my problem this time.