nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Merging Content from 3 different branches

shweta_komal

Hi,

We have a setup, where SitePublisher is implemented in 3 branches of TeamSite; all of these branches are identical (same files, same directory structure inside WorkArea) and have only 1 workarea in each (restriction imposed by SitePublisher). We have 3 different teams working on each of these 3 branches.

Every 1-2 months, we would need to merge the content of these 3 branches into one. Please suggest the best merging strategy for the same.

Thanks in advance,
Shweta Komal.

Find more posts tagged with

Comments

interDev

Hi,

We have a setup, where SitePublisher is implemented in 3 branches of TeamSite; all of these branches are identical (same files, same directory structure inside WorkArea) and have only 1 workarea in each (restriction imposed by SitePublisher). We have 3 different teams working on each of these 3 branches.

Every 1-2 months, we would need to merge the content of these 3 branches into one. Please suggest the best merging strategy for the same.

Thanks in advance,
Shweta Komal.

You need to clarify: 3 teams means development teams or content authoring teams?
you already said that the files, directories are same in all 3 branches then what is the need to merging?

Ae there common files which will be updated in more than one branch?

Solution would vary according to your exact requirements and getting some specifics would be helpful here.

Crsb

Hi,

Every 1-2 months, we would need to merge the content of these 3 branches into one. Please suggest the best merging strategy for the same.

Thanks in advance,
Shweta Komal.

I would write a script to walk thru one workarea at a time, check if file exists in the other 2 workareas: if it doesn't, copy the file to where it is missing; if it is already there, check modified date (or whatever condition that you want) and copy the newest to where it is old; ignore if the file is the same in the other workarea. repeat process for other workareas.
Of course this is just one simple way that i can think of doing it without looking thru the manuals and with more control over the process, but I am sure there is other fancier or simpler approaches. look thru the CLTs in the development tools section of CLT doc , you might be able to use combination of clts for faster merge like submitting workarea content and updating it from different branches.