From: LordSmoke <dslice@morphometrics.org>
To: git@vger.kernel.org
Subject: Re: Sharing nested subparts of large repository?
Date: Thu, 29 Mar 2012 13:05:49 -0700 (PDT) [thread overview]
Message-ID: <1333051549578-7419114.post@n2.nabble.com> (raw)
In-Reply-To: <1332957138457-7414676.post@n2.nabble.com>
Drat! I got my branches set up the way I wanted, but basic merge
restores/deletes files depending upon what I am merging with what. E.g.,
"master" <-merge- "development" deletes master's files I want to keep,
"development" <-merge- "master" adds back in the files I took out of
"development". Perhaps some merge options.
Still looking... 8-/
--
View this message in context: http://git.661346.n2.nabble.com/Sharing-nested-subparts-of-large-repository-tp7403743p7419114.html
Sent from the git mailing list archive at Nabble.com.
next prev parent reply other threads:[~2012-03-29 20:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-25 16:38 Sharing nested subparts of large repository? LordSmoke
2012-03-26 4:07 ` Phil Hord
2012-03-26 20:43 ` Dennis E. Slice
2012-03-28 9:52 ` Neal Kreitzinger
2012-03-28 17:52 ` LordSmoke
2012-03-29 20:05 ` LordSmoke [this message]
2012-04-05 8:32 ` LordSmoke
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=1333051549578-7419114.post@n2.nabble.com \
--to=dslice@morphometrics.org \
--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).