lkml.org 
[lkml]   [2008]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [GIT PATCH] split up feature-removal-schedule.txt
Date
Linus Torvalds <torvalds@linux-foundation.org> 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).


\
 
 \ /
  Last update: 2008-02-14 00:41    [W:0.069 / U:0.772 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site