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.
Owner of https://lemmy.einval.net/
Mastodon: https://mastodon.social/@einval
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.
Aliens: Special Edition
RIF. Ugh, what a shame.