{"thread":{"id":"36891","subject":"How to merge only existing files but not delete missing files","startedAt":"2014-06-11T11:39:24Z","lastAt":"2014-06-11T11:39:24Z","messageCount":1,"participants":["Adrian Stern"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"243903","messageId":"CAOHZ5L7pvpj+U4rbbgXhw7G8pkESXj3gB1caoEphMVSGEnqtnA@mail.gmail.com","threadId":"36891","inReplyTo":null,"subject":"How to merge only existing files but not delete missing files","fromName":"Adrian Stern","fromEmail":"adrian.stern@unchained.ch","sentAt":"2014-06-11T11:39:24Z","receivedAt":"2014-06-11T11:39:24Z","isPatch":false,"sender":{"key":"adrian.stern@unchained.ch","avatar":null},"body":"Hi\n\nI'm trying to find a setup which allows me to interact with a\nwriteprotected repository.\n\nOrig: This is a SVN repo which i cannot check out with git svn. Dunno\nwhy, but thats not the problem. I just create a new Git branch and\ncheck it out inside. After the merge, this repo can be deleted.\n\nDelta: This Git repo containes only files changed from Orig.\n\nThis means that Delta containes a subset of files from Orig. The\nchanges in Delta will have to be applied to Orig before compliling.\n\nSo i have tried various approaches and killed/recreated my Git repo a\nfiew times already. All i really want to do is merge the files from\nDelta into Orig while keeping the changes of Delta. But since Delta is\na subset of Orig, all files not included in Delta will get deleted.\n\nHow i expected it to work:\n\n1. create branch Orig and check out latest source from svn\n2. merge files from Delta into orig but do not delete anything\n\nBut with this all the files not present in Delta will be deleted in Orig.\n\nI guess i just don't understand how Git really works. But there are no\ntutorials for this specific situation. So what can i do?\n\nregards,\n\nAdrian Stern\n"}]}