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. -- 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