> As for dealing with merge conflicts, it's called That sounds like a lot of wor...

		yjftsjthsd-h on May 2, 2023 \| parent \| context \| favorite \| on: Let's make sure GitHub doesn't become the only opt... > As for dealing with merge conflicts, it's called That sounds like a lot of words for "try really hard to avoid having merge conflicts, because they suck to deal with"