Re: [GIT PATCH] split up feature-removal-schedule.txt

[Junio C Hamano]

Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes:

> On Wed, 13 Feb 2008, Linus Torvalds wrote:
>> 
>> 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.
>
> That, btw, includes "automatic merges" for something like a Linux-next 
> tree. It's easy to just make something that says: if the merge fails, try 
> to fix up these xyz files by just committing them with merge error markers 
> and all".
>
> That's fine for testing, exactly because it has no coding impact (and then 
> when a _real_ merge happens, you have a human that actually resolves it).
> ...
> Git if nothing if not scriptable, and things like this are *trivial*.

You can also use "union" low-level merge driver for such files
via gitattributes(5).
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/