From: Jeff King <peff@peff.net>
To: Adam Flott <adam@npjh.com>
Cc: git@vger.kernel.org
Subject: Re: Inheritance of files for parent/child branches
Date: Sat, 16 Feb 2008 13:39:25 -0500 [thread overview]
Message-ID: <20080216183925.GA20914@sigill.intra.peff.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0802161224160.32252@an.sumeria>
On Sat, Feb 16, 2008 at 12:33:42PM -0600, Adam Flott wrote:
> Your example is basically the only solution I could think of that would work
> with git. This repository will be for configuration files, where I want the
> parent to always "win" with conflicts.
Ah. That's much easier then. Instead of doing a real merge, you can just
checkout from the parent every file that has changed between the merge
base and the parent, and then make a new merge commit based on those
contents. And then the "merge" always succeeds.
-Peff
prev parent reply other threads:[~2008-02-16 18:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-16 17:32 Inheritance of files for parent/child branches Adam Flott
2008-02-16 18:09 ` Jeff King
2008-02-16 18:33 ` Adam Flott
2008-02-16 18:39 ` Jeff King [this message]
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=20080216183925.GA20914@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=adam@npjh.com \
--cc=git@vger.kernel.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 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).