From: Stephen Bash <bash@genarts.com>
To: git@vger.kernel.org
Subject: Merging split files
Date: Fri, 18 Mar 2011 09:22:36 -0400 (EDT) [thread overview]
Message-ID: <2495196.195017.1300454556155.JavaMail.root@mail.hq.genarts.com> (raw)
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 parent reply other threads:[~2011-03-18 13:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <31155742.183989.1300374518689.JavaMail.root@mail.hq.genarts.com>
2011-03-18 13:22 ` Stephen Bash [this message]
2011-03-29 15:16 ` Merging split files Jeff King
2011-03-29 16:33 ` Stephen Bash
2011-03-29 18:15 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2495196.195017.1300454556155.JavaMail.root@mail.hq.genarts.com \
--to=bash@genarts.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).