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; } } }

View Differences

Bhargav Coca

I am on TS6.5 SP1 on Win 2000 servers. I have a workflow in place which is working fine. Content gets deployed to production after a final approver approves it. At this final approver stage , the approver has option of viewing the differences by clicking on the view differences link in this approval email. This will open a window showing differences of the file which is attached and the version of same file in staging. Generally one sees these tabs for this window ( Visual, Source,Tags and Properties). But in somecases the tabs will be ( Visual, MERGE, Tags and Properties). If we click merge the file is not getting deployed to production. can any one enlighten me as why this happens.
Thank you

Find more posts tagged with

Comments

Migrateduser

Sounds like there's a file conflict.

You either need to train your users how to do the merging (good luck on that if they are typical end users), or you need to take some steps either in your workflow or with your branch structure or locking model to make it impossible for a conflict to occur.

jed

[snip]
or you need to take some steps either in your workflow or with your branch structure or locking model to make it impossible for a conflict to occur.

One workarea per branch makes a lot of issues go away Smiley Happy