Messages in this thread | | | Subject | Re: The direction linux is taking | Date | Sat, 29 Dec 2001 22:58:27 +0000 (GMT) | From | Alan Cox <> |
| |
> > Wrong. Most patches are independant, and even touch different functions. > > Really? And the data which shows this absolute statement to be true is > where? I'm happy to believe data, but there is no data here.
I rarely get clashes in merges with either 2.2 or with 2.4-ac when I was doing it. Offsets from multiple patches to the same file happen some times but its very rare two people had overlapping changes and when it happened it almost always meant that the two of them needed to talk because they were fixing the same thing or adding related features.
The big exception is Configure.help which is a nightmare for patch, and the one file I basically always did hand merges on - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |