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

Merging split files

From
SBStephen Bash <bash@genarts.com>
Date
Mar 18, 2011, 13:22 UTC
Message-ID
<2495196.195017.1300454556155.JavaMail.root@mail.hq.genarts.com>
In-Reply-To
<31155742.183989.1300374518689.JavaMail.root@mail.hq.genarts.com>
Hi all-
In our previous release foo.cxx contained both the base class and a few subclasses.  Since then the number of subclasses has grown, and we've split foo.cxx (base and sub-classes) into foo-base.cxx (base class) and foo-defs.cxx (sub-classes).  Since the release, we've had a few bug fixes in foo.cxx on the maintenance branch, and need to merge those back to development.  When I did the merge Git identified foo.cxx as moved to foo-defs.cxx, which worked for most changes, but a few needed to be in foo-base.cxx.  In this case it was a pretty trivial manual resolution, but is there a method for handling merges of split files?

Thanks, Stephen

Next: Jeff King
Message 1 of 4 in “Merging split files”
  1. Stephen BashMar 18, 2011
  2. Jeff KingMar 29, 2011
  3. Stephen BashMar 29, 2011
  4. Jeff KingMar 29, 2011

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.