this post was submitted on 23 Jun 2023
20 points (95.5% liked)
Programming
13375 readers
8 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 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Occasionally I'll get hit with a few unwieldy conflicts. Usually it's one or two lines, and always a whitespace issue because someone's code style just has to be different.