3 ms·
The point is M contains the fixes required to make A-B-C plus A-D build. Then you have no histories in that tree that don't compile. Like you said, A-B-C-D' D
by colanderman 14y ago
The point is M contains the fixes required to make A-B-C plus A-D build. Then you have no histories in that tree that don't compile.
Like you said, A-B-C-D' DOESN'T build, PRECISCELY because D' is the same diff as D. You need to make A-B-C-D'-M to get a working build, but the history A-B-C-D' is STILL BROKEN.
- philwelch 14y agoSo you run a build on D', make the necessary fixes, and amend it. Which is exactly what you would have had to do with M anyway, or else M wouldn't build either. I don't see any difference at all. Merge commits don't magically fix broken builds. All they do is ensure that you've resolved merge conflicts, but rebases do the same thing!