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

Re: merge strategy request

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Mar 25, 2007, 23:34 UTC
Message-ID
<46a038f90703251634t2ab6a455t382ebe29cdb53667@mail.gmail.com>
In-Reply-To
<7v648paj14.fsf@assigned-by-dhcp.cox.net>
On 3/25/07, Junio C Hamano <junkio@cox.net> wrote:
> Right.  In the current system, git-mergetool might be a better
> place to add support for special perpose 3-version file-level
> merge backend than merge-recursive, at least until gitattributes
> materializes.

Would it be possible to have an env var (GIT_MERGE) that can be used to call an arbitrary script with merge/diff3 semantics instead of using the internal 3-way merge? That way we could do syntax-specific merges (ignore comments/whitespace, for example).

i would surely have a use for it, as sometimes my internal team is not _that_ good about trimming whitespace, and we have merges that succeed except for their whitespace conflicts.

cheers,
martin
Previous: Junio C HamanoNext: David Lang
Message 7 of 10 in “merge strategy request”
  1. David LangMar 24, 2007
  2. Johannes SchindelinMar 25, 2007
  3. David LangMar 25, 2007
  4. Linus TorvaldsMar 25, 2007
  5. David LangMar 25, 2007
  6. Junio C HamanoMar 25, 2007
  7. Martin LanghoffMar 25, 2007
  8. David LangMar 25, 2007
  9. Junio C HamanoMar 25, 2007
  10. Martin LanghoffMar 26, 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.