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
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 15, 2015, 18:24 UTC
Message-ID
<9a75157bdced6251fdae7e08c4e6e56b@www.dscho.org>
In-Reply-To
<DUB407-EAS33488F5B18766E047421E9EAEC70@phx.gbl>
Hi,
On 2015-05-15 16:49, Dror Levy wrote:
> The same happens with version 2.4.1.windows.1

Thanks for checking, Johannes

Previous: Dror Levy
Message 5 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.