From: Eric Raible <raible@nextest.com>
To: Elijah Newren <newren@gmail.com>
Cc: Neal Kreitzinger <neal@rsss.com>, <git@vger.kernel.org>
Subject: Re: Re: merge removed content back into current content
Date: Mon, 27 Sep 2010 11:31:47 -0700 [thread overview]
Message-ID: <4CA0E313.4090501@nextest.com> (raw)
In-Reply-To: <AANLkTimxHbCktv=kaq0UfV+u1kH1Pb2LYA2Xi=qkgduW@mail.gmail.com>
On 11:59 AM, Elijah Newren wrote:
> btw, does anyone know how to force
> git apply to proceed and add conflict markers if necessary rather than
> just bailing out?
It's not quite the same, and you probably already know about it,
but there's always: git apply --reject
next prev parent reply other threads:[~2010-09-27 18:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-25 3:06 merge removed content back into current content Neal Kreitzinger
2010-09-25 23:43 ` Elijah Newren
2010-09-27 18:31 ` Eric Raible [this message]
2010-09-28 16:26 ` Neal Kreitzinger
2010-09-28 16:49 ` Neal Kreitzinger
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=4CA0E313.4090501@nextest.com \
--to=raible@nextest.com \
--cc=git@vger.kernel.org \
--cc=neal@rsss.com \
--cc=newren@gmail.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).