minus-squareeinval@lemmy.einval.nettoProgramming@beehaw.org•How often do you have to resolve merge conflicts?linkfedilinkarrow-up2·1 year agoOccasionally 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. linkfedilink
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.