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

How to merge only existing files but not delete missing files

From
ASAdrian Stern <adrian.stern@unchained.ch>
Date
Jun 11, 2014, 11:39 UTC
Message-ID
<CAOHZ5L7pvpj+U4rbbgXhw7G8pkESXj3gB1caoEphMVSGEnqtnA@mail.gmail.com>
Hi

I'm trying to find a setup which allows me to interact with a writeprotected repository.

Orig: This is a SVN repo which i cannot check out with git svn. Dunno
why, but thats not the problem. I just create a new Git branch and
check it out inside. After the merge, this repo can be deleted.
Delta: This Git repo containes only files changed from Orig.

This means that Delta containes a subset of files from Orig. The changes in Delta will have to be applied to Orig before compliling.

So i have tried various approaches and killed/recreated my Git repo a fiew times already. All i really want to do is merge the files from Delta into Orig while keeping the changes of Delta. But since Delta is a subset of Orig, all files not included in Delta will get deleted.

How i expected it to work:
1. create branch Orig and check out latest source from svn
2. merge files from Delta into orig but do not delete anything
But with this all the files not present in Delta will be deleted in Orig.

I guess i just don't understand how Git really works. But there are no tutorials for this specific situation. So what can i do?

regards,
Adrian Stern
Message 1 of 1 in “How to merge only existing files but not delete missing files”
  1. Adrian SternJun 11, 2014

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.