I work on maintaining the same e-commerce web-app for many customers.
Originally there was a standard set of pages from which all the rest of the customers were pre-optimized.
Recently I decided to use Mercurial for the control of the place where I worked. They have also decided that the standard set of pages for our e-commerce work again and develop them as a mainline / baseline.
It is being said that there are existing customizations for each of our customers, which were created before the base-line set of page-base, which are not registered in version control (HG) < / P>
What is the best way for us to merge the changes in a different line of different development from the baseline of development for each of our customers, Existing customizations
What is the best way to merge changes from the baseline of development, for each of our customers, there is a separate line of development, Keep current customization for the customer?
Just in the case of any other branches, e. G .:
alice ~ / wc / cust-xyz% hg bridge -u $ xyz alice ~ / wc / cust-xyz% hg ci allus ~ / wc / cust-xyz% hg ci Alice ~ / / wc / cust-XYZ% hg CI Ellis ~ / / wc / cust-XYZ% hg $ drag the menine ally ~ / wc / cust-xyz% hg merge aliis ~ / wc / cust-xyz% hg ci alis ~ / Wc / Cust-XYZ% hg push $ xyz
No comments:
Post a Comment