How is that different from conflict resolution today?
Git essentially automated patch file management, but the hard problem of incompatible changes is just as hard today.
Git essentially automated patch file management, but the hard problem of incompatible changes is just as hard today.
It was also much more difficult to figure out changes across multiple files with a single low-resolution (800 x 600 at the time, I think) monitor on a computer that could barely keep a few files open simultaneously.
Another big pain point was spending an hour or more downloading a patch (via dialup) only to realize that you needed other patches or files before you could actually start working on anything, or that you'd downloaded the wrong file, etc.
So there were many little inconveniences that added up to make it tremendously painful (in my memories) compared to today's experiences.
Again, that's unrelated to "patch management": I am not disputing we have better experience overall today, but none of that is due to git.