# Report a potential bug in merge

1 messages from 2020-12-03 to 2020-12-03. Participants: Zhao, Landy (NSB - CN/Qingdao).
Thread: https://gitlist.dev/t/54751

## Zhao, Landy (NSB - CN/Qingdao), 2020-12-03 08:34

Subject: Report a potential bug in merge
Message-ID: <8bff09a8285848d293659c639c4c1160@nokia-sbell.com>
URL: https://gitlist.dev/e/8bff09a8285848d293659c639c4c1160%40nokia-sbell.com
In-Reply-To: <86d9083a74d94a868e2949d6e3572c53@nokia-sbell.com>

```
Hello,
I'm merging in a branch, then conflicts are reported.

There is one line, it appears in local, base, and remote.
But Git report a conflict that this line is removed in remote.


[Sorry that I can't attach the full file as it belongs to company.]
The snapshot show local, base, remote and conflict file content.

Can't add picture in pure text format. Please find them in the archive.


Thanks,

Landy Zhao
Phone: MS Teams
Mobile: +86 15698162651


```