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

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, 13:56 UTC
Message-ID
<loom.20150515T153902-500@post.gmane.org>

This bug happens when attempting to merge a branch which was committed without normalization, with a branch which is normalized, from a machine set with normalization enabled.

When attempting to merge to normalized branch it returns an error and requests for manual merge.

Example of the output of the issue from the command line https://gist.github.com/Jiyuu/1ed14ac32e25abb884ef

repo for replication https://github.com/Jiyuu/gitbug

To replicate run(from a system using crlf line endings) the following command from the "a" branch: git merge -v -X theirs -X renormalize b

Next: Dror Levy
Message 1 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.