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:
conflict.7z
Description: conflict.7z
