# Re: git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit]

1 messages from 2010-03-27 to 2010-03-27. Participants: Jon Seymour.
Thread: https://gitlist.dev/t/23197

## Jon Seymour, 2010-03-27 03:34

Subject: Re: git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit]
Message-ID: <2cfc40321003262034m7b543b16xbc281899dc7beba2@mail.gmail.com>
URL: https://gitlist.dev/e/2cfc40321003262034m7b543b16xbc281899dc7beba2%40mail.gmail.com

```
| changed conflict --> __change___
>
> As a result, the user thinks that the only __change__ is the import
> statement, and elects to resolve the commit in favour of the local
> commit. This is the wrong thing to do because the remote hunk is then
> lost to the history.
>

```