Vendor-Branch setup

[Adrian Stern]

Hi

I have a Vendro-Branch setup where i store the official code in my own
repository. Next to that i have a Delta-Branch where i store only the
changed files different to the Vendor-Branch.

I have two problems with this setup:

1)
When updating the Vendor-Branch (File A, B, C), the file A which is
also present in the Delta-Branch, is not automatically updated in
Delta. I cannot merge Vendor into Delta because thousands of other
files would be added thus destroying the purpos of the Delta branch.
Checking out Delta after updating Vendor will load the file from
Delta. Can't i just merge the files already present in Delta from
Vendor to Delta?

2)
After upgrading Vendor and merging Delta to Vendor older files in
Delta get ignored and not Merged. File A for example is newer in
Vendor, but i need the changes from Delta. -X theirs does not work
eigther. What i want is the merge-window.

Merge Strategy "theirs" does not work. I get "Already up-to-date" each time.

Any sugestions how i could get this to work? Or maybe there is a more
logical setup?

Regards,

Adrian Stern
unchained - web solutions

***@unchained.ch
[phone]

[Sergey Organov]

Post by Adrian Stern
Hi
I have a Vendro-Branch setup where i store the official code in my own
repository. Next to that i have a Delta-Branch where i store only the
changed files different to the Vendor-Branch.

This Delta-Branch is the cause of your problems, I think. Why do you
need it at all? If you checkout it, what could you do with the result?

Instead, why don't you simply create your own branch from the root of
the vendor branch and make your own changes on this branch? That's how
it's supposed to work. Git is very efficient at storing only deltas
internally so you shouldn't care about it.