git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Report a potential bug in merge

From
ZCZhao, Landy (NSB - CN/Qingdao) <landy.zhao@nokia-sbell.com>
Date
Dec 3, 2020, 08:34 UTC
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
Message 1 of 1 in “Report a potential bug in merge”
  1. Zhao, Landy (NSB - CN/Qingdao)Dec 3, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.