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

Re: Trouble with file specific merge strategies

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 11, 2012, 08:57 UTC
Message-ID
<7vk42rzfab.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAMXnza3SLHWLsFkYLhkJLAwtP2n=QVTXZ__GSL-CvajxC6i0Dw@mail.gmail.com>
suvayu ali <fatkasuvayu+linux@gmail.com> writes:
Show 5 quoted lines
> ... So when I came across
> the possibility of using .gitattributes for file specific merge
> strategies, I tried the following:
>
> pattern merge=ours

I do not think we say .gitattributes can give merge strategy anywhere in our document.

You can choose one of the few built-in merge drivers but "ours" is not one of them. Have you defined your own merge driver "ours" following the example in the gitattributes documentation (look for "feel-free merge driver")?

Previous: suvayu aliNext: suvayu ali
Message 2 of 7 in “Trouble with file specific merge strategies”
  1. suvayu aliMar 10, 2012
  2. Junio C HamanoMar 11, 2012
  3. suvayu aliMar 11, 2012
  4. Junio C HamanoMar 11, 2012
  5. suvayu aliMar 11, 2012
  6. Thomas HochsteinMar 11, 2012
  7. suvayu aliMar 11, 2012

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.