From: Jay Soffian <jaysoffian@gmail.com>
Date: Sun, 15 Mar 2009 12:47:30 GMT
Subject: Re: excluding files from a merge
Message-ID: <76718490903150547o1c791d35r5d71000b481f443b@mail.gmail.com>
In-Reply-To: <loom.20090315T011519-497@post.gmane.org>

On Sat, Mar 14, 2009 at 9:23 PM, Daniel Jacobs <djacobs7@gmail.com> wrote:
> I would like it if every file was merged, except for files that were explictly
> excluded from a merge between these two branches.  Is there a good way to do
> this?

Please see http://thread.gmane.org/gmane.comp.version-control.git/110488
(Is there a way to exclude user-specified files or directories from
participating in merges?)

I believe it is the same use case, and Junio provided a very detailed reply.

HTH,

j.