threads / discuss / 21247

unrelated file conflict during rebase

Subject: unrelated file conflict during rebase

## tl;dr

One message between Oct 15, 2009 and Oct 15, 2009.

replies: 0people: 1as markdown or json

bill lam· Oct 15, 2009, 10:35 UTC · lore

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

$ 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.