Resolve conflicts issue

Dear all,
I'm experiencing conflict issue when I try to submit a page. I use Dreamweaver MX 2004 to manage the website pages and I use the FTP to upload a file in Teamsite. When I submit the pages changed with Dreamweaver in 50% of cases I receive a conflict issue. Also I'm the only one that manage the website so no one else is modifying the same page of mine.
Do you have any idea? Can I use Dreamweaver FTP to upload a file in Teamsite branch and then submit it?

Thanks in advance,
Andrea

Find more posts tagged with

Comments

nipper

What happens when you submit ? What does it say caused the conflict ? I copy/ftp files into a WA often without an issue.

Are there any other workareas on this branch ? Are the files locked ?

bigangels

What happens when you submit ? What does it say caused the conflict ? I copy/ftp files into a WA often without an issue.

Are there any other workareas on this branch ? Are the files locked ?

I'm trying to submit the file and the message of the task is "There are files in conflict." the file is not locked and the conflict type is "File Conflict" and there are just the WORKAREA and the STAGING AREA. If I click on Compare to compare areas in the Conflicts tabs there are a lot of file listed and if I click on File Difference where Teamsite show me the properties, the only two difference are in the Modified by item (WORKAREA = root and STAGINAREA = myID) and in Version (WORKAREA = 0+ and STAGINAREA = 4) and in permissions (WORKAREA = rwxrwxr-x and STAGINAREA = rw-rw-r-- ) and the date/time and Size are exactly the same. Maybe the problem is related to the changes of the owner and the permission that has been changed in the WORKAREA and not in the STAGING area.

nipper

in Version (WORKAREA = 0+ and STAGINAREA = 4)

That is the issue, though I am at a loss as to how it happened.

Do a get latest from the workarea (with overwrite turn ON). Be certain that you will not lose anything in the WA.

Then do a compare, does it say revision 4 or revision 0 ?

I am racking my brain, but I *think* there is an entry in iw.cfg you will need to flip, to let TS know there is a new version when overwritten, not a new file.

One other question, about DW ftp, does it make a temp file and then move it to the new file when uploaded ? (like create foo.html.tmp then changes it to foo.html) ? That can cause the behavior you are seeing.

Andy

bigangels

I don't know why but 99% of file in the workarea have a conflict with the staging area. Maybe someone on the server, reset permission on change owner and this for TS means something changed in the file so this show a conflict between STAGING and WORKAREA. As I'm working directly on the stagingarea I would like to know if there is a way to reset conflict and take as righ file what I've in the WORKAREA and so reset the STAGING AREA.
DW FTP doesn't use temp file before upload it.

RonaldV

Hi BigAngels,

I would do a simple test in your workarea:

- do a get-latest of the whole workarea
- do a compare with staging to confirm that WA & Staging are 100% equal
- modify a file via via DW & ftp
- submit

This test should simply always work. If not let us know what & how.

Cheers, Ronald

bigangels

Hi Ronald,

I'm quite worried on do a get-latest of the whole workarea as you suggest. Because I think the right files are on WORKAREA as I work directly there with DW. So get lastes will take all the file from the STAGINGAREA and copy back to the WORKAREA. Is that correct?

nipper

Yes that is exactly what will happen. The issue is that TS *thinks* there are 4 versions between the file you have and the one in staging. If there is only 1 workarea, then it should be (with a few file modifications) be almost exactly like the staging area.