From: Zhao, Landy (NSB - CN/Qingdao) <landy.zhao@nokia-sbell.com>
Date: Thu, 03 Dec 2020 08:34:28 GMT
Subject: Report a potential bug in merge
Message-ID: <8bff09a8285848d293659c639c4c1160@nokia-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