* Report a potential bug in merge
[not found] ` <86d9083a74d94a868e2949d6e3572c53@nokia-sbell.com>
@ 2020-12-03 8:34 ` Zhao, Landy (NSB - CN/Qingdao)
0 siblings, 0 replies; only message in thread
From: Zhao, Landy (NSB - CN/Qingdao) @ 2020-12-03 8:34 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
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
[-- Attachment #2: conflict.7z --]
[-- Type: application/octet-stream, Size: 27999 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-03 8:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <754715f2ecf543519854de8fa3f4b55c@nokia-sbell.com>
[not found] ` <86d9083a74d94a868e2949d6e3572c53@nokia-sbell.com>
2020-12-03 8:34 ` Report a potential bug in merge Zhao, Landy (NSB - CN/Qingdao)
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).