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

Re: Problem with merge when renaming

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 18, 2007, 22:28 UTC
Message-ID
<7v7imnvca0.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<95b3d0af0709181334y1e21507ey485860e4d45aa26f@mail.gmail.com>
"David Euresti" <evelio@gmail.com> writes:
> I think I found a problem when you move a file into a directory of the
> same name.  Here's what I did.
Two questions.
 (1) git --version?
 (2) if you do "git merge -s resolve" instead of just "git
     merge", do you see a difference?
Previous: Alex RiesenNext: David Euresti
Message 3 of 7 in “Problem with merge when renaming”
  1. David EurestiSep 18, 2007
  2. Extend t6020 with another test for d/f interactionsAlex Riesen, Sep 18, 2007
  3. Junio C HamanoSep 18, 2007
  4. David EurestiSep 18, 2007
  5. Alex RiesenSep 18, 2007
  6. Junio C HamanoSep 18, 2007
  7. Alex RiesenSep 19, 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.