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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html