Messages in this thread | | | Date | Wed, 13 Feb 2008 11:32:41 -0800 | From | Andrew Morton <> | Subject | Re: [GIT PATCH] split up feature-removal-schedule.txt |
| |
On Wed, 13 Feb 2008 10:13:42 -0800 (PST) Linus Torvalds <torvalds@linux-foundation.org> wrote:
> > > On Wed, 13 Feb 2008, Joe Perches wrote: > > > > MAINTAINERS is the most frequently patched file > > Almost all of them merge perfectly, with no problems what-so-ever. And the > merge conflicts, when they happen, are generally really trivial, and never > cause any subtle run-time bugs even if they were to happen. > > So in that sense, I think both MAINTAINERS and the deprecation schedule > are totally uninteresting. Yes, they have merge conflicts. But those merge > conflicts are really really easy to handle. >
yup. I'll often get conflicts and rejects in those files from the git trees which I don't even bother fixing.
| |