From: Stephen Bash <bash@genarts.com>
Date: Fri, 18 Mar 2011 13:22:36 GMT
Subject: Merging split files
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