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

5 messages from 2015-05-15 to 2015-05-15. Participants: Dror Levy, Johannes Schindelin.
Thread: https://gitlist.dev/t/39345

## Dror Levy, 2015-05-15 13:56

Subject: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options
Message-ID: <loom.20150515T153902-500@post.gmane.org>
URL: https://gitlist.dev/e/loom.20150515T153902-500%40post.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

```

## Dror Levy, 2015-05-15 14:14

Subject: Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options
Message-ID: <loom.20150515T160501-69@post.gmane.org>
URL: https://gitlist.dev/e/loom.20150515T160501-69%40post.gmane.org
In-Reply-To: <loom.20150515T153902-500@post.gmane.org>

```
Using git version 1.9.5.msysgit.1

```

## Johannes Schindelin, 2015-05-15 14:35

Subject: Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options
Message-ID: <dba4955a359a93ff8fba2addc2de0e5a@www.dscho.org>
URL: https://gitlist.dev/e/dba4955a359a93ff8fba2addc2de0e5a%40www.dscho.org
In-Reply-To: <loom.20150515T160501-69@post.gmane.org>

```
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

```

## Dror Levy, 2015-05-15 14:49

Subject: RE: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options
Message-ID: <DUB407-EAS33488F5B18766E047421E9EAEC70@phx.gbl>
URL: https://gitlist.dev/e/DUB407-EAS33488F5B18766E047421E9EAEC70%40phx.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

```

## Johannes Schindelin, 2015-05-15 18:24

Subject: RE: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options
Message-ID: <9a75157bdced6251fdae7e08c4e6e56b@www.dscho.org>
URL: https://gitlist.dev/e/9a75157bdced6251fdae7e08c4e6e56b%40www.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

```