From: Junio C Hamano <junio@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Joe Perches <joe@perches.com>, Greg KH <gregkh@suse.de>,
David Miller <davem@davemloft.net>,
akpm@linux-foundation.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PATCH] split up feature-removal-schedule.txt
Date: Wed, 13 Feb 2008 15:38:20 -0800 [thread overview]
Message-ID: <7v4pcco2ab.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.1.00.0802131014240.2920@woody.linux-foundation.org> (Linus Torvalds's message of "Wed, 13 Feb 2008 10:19:25 -0800 (PST)")
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).
next prev parent reply other threads:[~2008-02-13 23:39 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-13 7:02 [GIT PATCH] split up feature-removal-schedule.txt Greg KH
2008-02-13 7:04 ` David Miller
2008-02-13 7:22 ` Joe Perches
2008-02-13 16:18 ` Randy Dunlap
2008-02-13 16:59 ` Greg KH
2008-02-13 17:33 ` Joe Perches
2008-02-13 17:47 ` Greg KH
2008-02-13 18:13 ` Linus Torvalds
2008-02-13 18:19 ` Linus Torvalds
2008-02-13 23:38 ` Junio C Hamano [this message]
2008-02-13 19:32 ` Andrew Morton
2008-02-19 19:07 ` Greg KH
2008-02-19 19:34 ` Randy Dunlap
2008-02-19 19:49 ` Greg KH
2008-02-19 20:06 ` Adrian Bunk
2008-02-13 7:27 ` KOSAKI Motohiro
2008-02-13 10:30 ` [GIT PATCH] " Pekka Pietikainen
2008-02-13 17:00 ` Greg KH
2008-02-13 12:11 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4pcco2ab.fsf@gitster.siamese.dyndns.org \
--to=junio@pobox.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=gregkh@suse.de \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.