When trying to merge files - File Difference is a blank page

We have a problem with 'File Difference' displaying a blank page. Currently we have one branch that uses the Copy-Modify-Merge Solution. These user have a share directory and edits directly thru Dreamweaver.

Here's our scenario:

1. User 1 edits File A but doesn't submit
2. User 2 edits File A and submits to Staging
3. User 1 is done with his/her edits and submits File A.
4. User 1 gets a resolve conflict error.
5. User 1 tries to 'compare' and view 'File Difference' but gets a blank page.

User 1 wants to merge his/her version with the one on Staging.

Any idea why we get the blank page when trying to 'compare' and merge the workarea version with Staging?

Thanks.

TS 6.5 SP1 / Sol 9

Find more posts tagged with

Comments

Adam Stoller

It's been a while since I've looked at the File Difference UI - but I seem to recall that there are tabs across the top and one of them (usually *not* the one that is initially selected) is something like "Source" - and you need to click on that tab to get the source differencing interface.

--fish
Senior Consultant, Quotient Inc.
http://www.quotient-inc.com