git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Sharing nested subparts of large repository?

From
LLordSmoke <dslice@morphometrics.org>
Date
Mar 29, 2012, 20:05 UTC
Message-ID
<1333051549578-7419114.post@n2.nabble.com>
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.

Previous: LordSmokeNext: LordSmoke
Message 6 of 7 in “Sharing nested subparts of large repository?”
  1. LordSmokeMar 25, 2012
  2. Phil HordMar 26, 2012
  3. Dennis E. SliceMar 26, 2012
  4. Neal KreitzingerMar 28, 2012
  5. LordSmokeMar 28, 2012
  6. LordSmokeMar 29, 2012
  7. LordSmokeApr 5, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.