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

Re: Trouble with file specific merge strategies

From
suvayu ali <fatkasuvayu+linux@gmail.com>
Date
Mar 11, 2012, 11:27 UTC
Message-ID
<CAMXnza2KeDB+=59jduBWc9_6xD0qaOXSx2psX0pYDY+LwqTX0w@mail.gmail.com>
In-Reply-To
<7vd38jxu5b.fsf@alter.siamese.dyndns.org>
Hi Junio,
On Sun, Mar 11, 2012 at 12:18, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> suvayu ali <fatkasuvayu+linux@gmail.com> writes:
>
>> ... is that discussion on progit talking about
>> something else?
>
> Sorry, I do not read or write progit, so I do not know offhand what
> it says in the section you read and I cannot judge if it was you who
> misread, or if it was book that misspoke.
>
Okay, thanks. I'll switch back to the tried and tested,
$ git merge -s ours
I'll take up the progit issue on the relevant discussion boards.
-- 
Suvayu

Open source is the future. It sets us free.
Previous: Junio C HamanoNext: Thomas Hochstein
Message 5 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.