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

Canonical method of merging two projects

From
Peter Karlsson <peter@softwolves.pp.se>
Date
Apr 14, 2008, 06:37 UTC
Message-ID
<Pine.LNX.4.64.0804140733500.7014@ds9.cixit.se>
Hi!

What is the canonical way of merging an unrelated project into another so that all of the merged project's files appear in a sub-directory of the first?

I have two projects, A with files "a.txt" and "b.txt", and B with files "a.txt" and "c.txt", each in a separate Git repoistory. I want to merge those two projects, throwing away the B repository, and achieve a file layout that has "a.txt" and "b.txt" from A, and "B/a.txt" and "B/c.txt" from B. I.e, the two files with the same name are unrelated, and all of B's file should end up in a sub-directory.

I do not want to use submodules, since I am planning on throwing B away.

When I did this, I did a regular "git merge --no-commit", and then moved the files manually. Thankfully, I only had one duplicated file name, so fixing the conflict was easy enough. I looked through the git-merge manual page, but could not find any information about this use-case.

-- 
\\// Peter - http://www.softwolves.pp.se/
Next: Gabriel
Message 1 of 3 in “Canonical method of merging two projects”
  1. Peter KarlssonApr 14, 2008
  2. GabrielApr 14, 2008
  3. Eric RaibleApr 14, 2008

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.