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

RE: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options

From
DLDror Levy <drorlevy@live.com>
Date
May 15, 2015, 14:49 UTC
Message-ID
<DUB407-EAS33488F5B18766E047421E9EAEC70@phx.gbl>
In-Reply-To
<dba4955a359a93ff8fba2addc2de0e5a@www.dscho.org>
The same happens with version 2.4.1.windows.1
Sent: 15 May 2015 17:35
Subject: Re: Bug when merging non normalized branch with normalized branch
using the -X theirs -X renormalize options
Hi,
On 2015-05-15 16:14, Dror Levy wrote:
> Using git version 1.9.5.msysgit.1

Please verify with Git for Windows 2.x (developers' preview) from https://git-for-windows.github.io/ whether the problem persists.

Ciao, Johannes

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 4 of 5 in “Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options”
  1. Dror LevyMay 15, 2015
  2. Dror LevyMay 15, 2015
  3. Johannes SchindelinMay 15, 2015
  4. Dror LevyMay 15, 2015
  5. Johannes SchindelinMay 15, 2015

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.