Re:Let's Make Sure GitHub Doesn't Become the Only Option
by yjftsjthsd-h on Tuesday May 02, 2023 @12:30PM
(#35790102)
> 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"
As for dealing with merge conflicts, it's called
The problem with merge conflicts is you have two people changing the same lines of code at the same time. So I would imagine if you wanted to improve the situation you would need an AI powered version control system that understood the intent of the previous developers. But that's not going to fix bad habits.