* Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options @ 2015-05-15 13:56 Dror Levy 2015-05-15 14:14 ` Dror Levy 0 siblings, 1 reply; 5+ messages in thread From: Dror Levy @ 2015-05-15 13:56 UTC (permalink / raw) To: git 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options 2015-05-15 13:56 Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options Dror Levy @ 2015-05-15 14:14 ` Dror Levy 2015-05-15 14:35 ` Johannes Schindelin 0 siblings, 1 reply; 5+ messages in thread From: Dror Levy @ 2015-05-15 14:14 UTC (permalink / raw) To: git Using git version 1.9.5.msysgit.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options 2015-05-15 14:14 ` Dror Levy @ 2015-05-15 14:35 ` Johannes Schindelin 2015-05-15 14:49 ` Dror Levy 0 siblings, 1 reply; 5+ messages in thread From: Johannes Schindelin @ 2015-05-15 14:35 UTC (permalink / raw) To: Dror Levy; +Cc: git 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options 2015-05-15 14:35 ` Johannes Schindelin @ 2015-05-15 14:49 ` Dror Levy 2015-05-15 18:24 ` Johannes Schindelin 0 siblings, 1 reply; 5+ messages in thread From: Dror Levy @ 2015-05-15 14:49 UTC (permalink / raw) To: 'Johannes Schindelin'; +Cc: git 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options 2015-05-15 14:49 ` Dror Levy @ 2015-05-15 18:24 ` Johannes Schindelin 0 siblings, 0 replies; 5+ messages in thread From: Johannes Schindelin @ 2015-05-15 18:24 UTC (permalink / raw) To: Dror Levy; +Cc: git Hi, On 2015-05-15 16:49, Dror Levy wrote: > The same happens with version 2.4.1.windows.1 Thanks for checking, Johannes ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-15 18:25 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-05-15 13:56 Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options Dror Levy 2015-05-15 14:14 ` Dror Levy 2015-05-15 14:35 ` Johannes Schindelin 2015-05-15 14:49 ` Dror Levy 2015-05-15 18:24 ` Johannes Schindelin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).