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

Re: [PATCH (resend)] Pass -C1 to git-apply in StGIT's apply_diff() and apply_patch().

From
TBTomash Brechko <tomash.brechko@gmail.com>
Date
Apr 11, 2007, 07:51 UTC
Message-ID
<20070411075133.GA5329@moonlight.home>
In-Reply-To
<b0943d9e0704101538p3de0bf56m7906cfe2f5fc157e@mail.gmail.com>
On Tue, Apr 10, 2007 at 23:38:55 +0100, Catalin Marinas wrote:
> When something has changed in the surrounding code (not touched by
> your patch), the automatic three-way merge should, in general, be able
> to solve the issue as it uses the ancestor information. Is the
> automatic three-way merge failing as well in your case?

OK, maybe I was pushing too much. Indeed, three-way merge will solve it, I just don't have a setup where it runs automatically, and I thought the mege could be avoided alltogether. But I agree the problem is easily managable.

And as you agree that the option would be nice we are on the same page. Thanks you!

-- 
   Tomash Brechko
Previous: Catalin Marinas
Message 6 of 6 in “Pass -C1 to git-apply in StGIT's apply_diff() and apply_patch().”
  1. Pass -C1 to git-apply in StGIT's apply_diff() and apply_patch().Tomash Brechko, Apr 9, 2007
  2. Catalin MarinasApr 10, 2007
  3. Tomash BrechkoApr 10, 2007
  4. Tomash BrechkoApr 10, 2007
  5. Catalin MarinasApr 10, 2007
  6. Tomash BrechkoApr 11, 2007

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.