{"thread":{"id":"39345","subject":"Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options","startedAt":"2015-05-15T13:56:48Z","lastAt":"2015-05-15T18:24:57Z","messageCount":5,"participants":["Dror Levy","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"261336","messageId":"loom.20150515T153902-500@post.gmane.org","threadId":"39345","inReplyTo":null,"subject":"Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options","fromName":"Dror Levy","fromEmail":"drorlevy@live.com","sentAt":"2015-05-15T13:56:48Z","receivedAt":"2015-05-15T13:56:48Z","isPatch":false,"sender":{"key":"drorlevy@live.com","avatar":null},"body":"This bug happens when attempting to merge a branch which was committed \nwithout normalization, with a branch which is normalized, from a machine \nset with normalization enabled.\n\nWhen attempting to merge to normalized branch it returns an error and \nrequests for manual merge.\n\nExample of the output of the issue from the command line\nhttps://gist.github.com/Jiyuu/1ed14ac32e25abb884ef\n\nrepo for replication\nhttps://github.com/Jiyuu/gitbug\n\n\nTo replicate run(from a system using crlf line endings) the following \ncommand from the \"a\" branch:\ngit merge -v -X theirs -X renormalize b\n"},{"id":"261337","messageId":"loom.20150515T160501-69@post.gmane.org","threadId":"39345","inReplyTo":"loom.20150515T153902-500@post.gmane.org","subject":"Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options","fromName":"Dror Levy","fromEmail":"drorlevy@live.com","sentAt":"2015-05-15T14:14:01Z","receivedAt":"2015-05-15T14:14:01Z","isPatch":false,"sender":{"key":"drorlevy@live.com","avatar":null},"body":"Using git version 1.9.5.msysgit.1\n"},{"id":"261339","messageId":"dba4955a359a93ff8fba2addc2de0e5a@www.dscho.org","threadId":"39345","inReplyTo":"loom.20150515T160501-69@post.gmane.org","subject":"Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2015-05-15T14:35:15Z","receivedAt":"2015-05-15T14:35:15Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn 2015-05-15 16:14, Dror Levy wrote:\n> Using git version 1.9.5.msysgit.1\n\nPlease verify with Git for Windows 2.x (developers' preview) from https://git-for-windows.github.io/ whether the problem persists.\n\nCiao,\nJohannes\n"},{"id":"261343","messageId":"DUB407-EAS33488F5B18766E047421E9EAEC70@phx.gbl","threadId":"39345","inReplyTo":"dba4955a359a93ff8fba2addc2de0e5a@www.dscho.org","subject":"RE: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options","fromName":"Dror Levy","fromEmail":"drorlevy@live.com","sentAt":"2015-05-15T14:49:51Z","receivedAt":"2015-05-15T14:49:51Z","isPatch":false,"sender":{"key":"drorlevy@live.com","avatar":null},"body":"The same happens with version 2.4.1.windows.1\n\n\nSent: 15 May 2015 17:35\nSubject: Re: Bug when merging non normalized branch with normalized branch\nusing the -X theirs -X renormalize options\n\nHi,\n\nOn 2015-05-15 16:14, Dror Levy wrote:\n> Using git version 1.9.5.msysgit.1\n\nPlease verify with Git for Windows 2.x (developers' preview) from\nhttps://git-for-windows.github.io/ whether the problem persists.\n\nCiao,\nJohannes\n"},{"id":"261359","messageId":"9a75157bdced6251fdae7e08c4e6e56b@www.dscho.org","threadId":"39345","inReplyTo":"DUB407-EAS33488F5B18766E047421E9EAEC70@phx.gbl","subject":"RE: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2015-05-15T18:24:57Z","receivedAt":"2015-05-15T18:24:57Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn 2015-05-15 16:49, Dror Levy wrote:\n> The same happens with version 2.4.1.windows.1\n\nThanks for checking,\nJohannes\n"}]}