22
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 23 Jun 2023
22 points (100.0% liked)
Programming
13361 readers
29 users here now
All things programming and coding related. Subcommunity of Technology.
This community's icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.
founded 2 years ago
MODERATORS
I have to resolve them way more than I should. We have internal devs and external devs and there is a lot of treading on toes. For any conflict that isn't super obvious (90% are) ^*^ I just ask the two devs involved to resolve it together, in a sensible way that keeps the unit tests working.
^*^ Usually the non-obvious conflicts are the ones where it's not just a matter of choosing A or B, but splicing A code with B code.