From: Brent Goodrick Date: Wed, 18 Feb 2009 05:39:12 GMT Subject: Re: Is there a way to exclude user-specified files or directories from participating in merges? Message-ID: In-Reply-To: <7vfxic1p6m.fsf@gitster.siamese.dyndns.org> On Tue, Feb 17, 2009 at 5:58 PM, Junio C Hamano wrote: > Compared to that, the two simple rules "commit changes to generic things > only to the generic branch" and "merge only from generic to specific" will > not grow as your project grows in complexity. I now I see the wisdom of the above statement. You've given me a lot of approaches to think about and try. Thanks for your help! bg