{"thread":{"id":"37690","subject":"Vendor-Branch setup","startedAt":"2014-10-08T14:07:39Z","lastAt":"2014-10-08T14:46:37Z","messageCount":2,"participants":["Adrian Stern","Sergey Organov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"250358","messageId":"CAOHZ5L4aAT0vYfJ4g=5NmED9=nWyHS1ATf+15Y060uiz=CtkRQ@mail.gmail.com","threadId":"37690","inReplyTo":null,"subject":"Vendor-Branch setup","fromName":"Adrian Stern","fromEmail":"adrian.stern@unchained.ch","sentAt":"2014-10-08T14:07:39Z","receivedAt":"2014-10-08T14:07:39Z","isPatch":false,"sender":{"key":"adrian.stern@unchained.ch","avatar":null},"body":"Hi\n\nI have a Vendro-Branch setup where i store the official code in my own\nrepository. Next to that i have a Delta-Branch where i store only the\nchanged files different to the Vendor-Branch.\n\nI have two problems with this setup:\n\n1)\nWhen updating the Vendor-Branch (File A, B, C), the file A which is\nalso present in the Delta-Branch, is not automatically updated in\nDelta. I cannot merge Vendor into Delta because thousands of other\nfiles would be added thus destroying the purpos of the Delta branch.\nChecking out Delta after updating Vendor will load the file from\nDelta. Can't i just merge the files already present in Delta from\nVendor to Delta?\n\n2)\nAfter upgrading Vendor and merging Delta to Vendor older files in\nDelta get ignored and not Merged. File A for example is newer in\nVendor, but i need the changes from Delta. -X theirs does not work\neigther. What i want is the merge-window.\n\nMerge Strategy \"theirs\" does not work. I get \"Already up-to-date\" each time.\n\nAny sugestions how i could get this to work? Or maybe there is a more\nlogical setup?\n\nRegards,\n\nAdrian Stern\nunchained - web solutions\n\nadrian.stern@unchained.ch\n+41 79 292 83 47\n"},{"id":"250359","messageId":"87vbnupqk2.fsf@osv.gnss.ru","threadId":"37690","inReplyTo":"CAOHZ5L4aAT0vYfJ4g=5NmED9=nWyHS1ATf+15Y060uiz=CtkRQ@mail.gmail.com","subject":"Re: Vendor-Branch setup","fromName":"Sergey Organov","fromEmail":"sorganov@gmail.com","sentAt":"2014-10-08T14:46:37Z","receivedAt":"2014-10-08T14:46:37Z","isPatch":false,"sender":{"key":"sorganov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8501568?v=4"},"body":"Adrian Stern <adrian.stern@unchained.ch> writes:\n\n> Hi\n>\n> I have a Vendro-Branch setup where i store the official code in my own\n> repository. Next to that i have a Delta-Branch where i store only the\n> changed files different to the Vendor-Branch.\n\nThis Delta-Branch is the cause of your problems, I think. Why do you\nneed it at all? If you checkout it, what could you do with the result?\n\nInstead, why don't you simply create your own branch from the root of\nthe vendor branch and make your own changes on this branch? That's how\nit's supposed to work. Git is very efficient at storing only deltas\ninternally so you shouldn't care about it.\n\n-- \nSergey.\n"}]}