git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Re: merge removed content back into current content

From
EREric Raible <raible@nextest.com>
Date
Sep 27, 2010, 18:31 UTC
Message-ID
<4CA0E313.4090501@nextest.com>
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

Previous: Elijah NewrenNext: Neal Kreitzinger
Message 3 of 5 in “merge removed content back into current content”
  1. Neal KreitzingerSep 25, 2010
  2. Elijah NewrenSep 25, 2010
  3. Eric RaibleSep 27, 2010
  4. Neal KreitzingerSep 28, 2010
  5. Neal KreitzingerSep 28, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.