{"thread":{"id":"54751","subject":"Report a potential bug in merge","startedAt":"2020-12-03T08:35:35Z","lastAt":"2020-12-03T08:35:35Z","messageCount":1,"participants":["Zhao, Landy (NSB - CN/Qingdao)"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"411213","messageId":"8bff09a8285848d293659c639c4c1160@nokia-sbell.com","threadId":"54751","inReplyTo":"86d9083a74d94a868e2949d6e3572c53@nokia-sbell.com","subject":"Report a potential bug in merge","fromName":"Zhao, Landy (NSB - CN/Qingdao)","fromEmail":"landy.zhao@nokia-sbell.com","sentAt":"2020-12-03T08:34:28Z","receivedAt":"2020-12-03T08:35:35Z","isPatch":false,"sender":{"key":"landy.zhao@nokia-sbell.com","avatar":null},"body":"Hello,\nI'm merging in a branch, then conflicts are reported.\n\nThere is one line, it appears in local, base, and remote.\nBut Git report a conflict that this line is removed in remote.\n\n\n[Sorry that I can't attach the full file as it belongs to company.]\nThe snapshot show local, base, remote and conflict file content.\n\nCan't add picture in pure text format. Please find them in the archive.\n\n\nThanks,\n\nLandy Zhao\nPhone: MS Teams\nMobile: +86 15698162651\n\n"}]}