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

unrelated file conflict during rebase

From
BLbill lam <cbill.lam@gmail.com>
Date
Oct 15, 2009, 10:35 UTC
Message-ID
<20091015103525.GI27040@debian.b2j>

Something I change a file in rebase -i. During the process, for some commits, git said some other apparently unrelated files (not that I had changed) caused merged conflicts usually both modified. Why did this happen?

-- 
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
Message 1 of 1 in “unrelated file conflict during rebase”
  1. bill lamOct 15, 2009

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.