From: Brent Goodrick <bgoodr@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Is there a way to exclude user-specified files or directories from participating in merges?
Date: Tue, 17 Feb 2009 21:39:12 -0800 [thread overview]
Message-ID: <e38bce640902172139h6ddda8e8va089e514e625de52@mail.gmail.com> (raw)
In-Reply-To: <7vfxic1p6m.fsf@gitster.siamese.dyndns.org>
On Tue, Feb 17, 2009 at 5:58 PM, Junio C Hamano <gitster@pobox.com> 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
next prev parent reply other threads:[~2009-02-18 5:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-18 0:49 Is there a way to exclude user-specified files or directories from participating in merges? Brent Goodrick
2009-02-18 1:05 ` Junio C Hamano
2009-02-18 1:32 ` Brent Goodrick
2009-02-18 1:58 ` Junio C Hamano
2009-02-18 5:39 ` Brent Goodrick [this message]
2009-02-18 1:36 ` Junio C Hamano
2009-02-18 13:33 ` Sitaram Chamarty
2009-02-18 19:02 ` Junio C Hamano
2009-02-19 13:37 ` Sitaram Chamarty
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=e38bce640902172139h6ddda8e8va089e514e625de52@mail.gmail.com \
--to=bgoodr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).