conflict

I am reading through TS Admin PDF for 6.7.0. To facilitate parallel develpment on a file in different work areas, I can use "submit" lock on a branch. So if two authors using same file and changing the contents, first author has lock on the file. After first author submits the file, the file has changed. So the file is different from the one which second author is using. Now when second author submits the file, the contents of the file in staging being different because of the changes by first author, wont it create conflict while submitting the file ?

If it does, then how is parallel development possible ?

thanks

Find more posts tagged with

Comments

Adam Stoller

I am reading through TS Admin PDF for 6.7.0. To facilitate parallel develpment on a file in different work areas, I can use "submit" lock on a branch. So if two authors using same file and changing the contents, first author has lock on the file. After first author submits the file, the file has changed. So the file is different from the one which second author is using. Now when second author submits the file, the contents of the file in staging being different because of the changes by first author, wont it create conflict while submitting the file ?

If it does, then how is parallel development possible ?

thanks

Yes - it will create a conflict. TeamSite will recognize this and should request that the user merge their changes into the latest version from STAGING - which brings up the Diff/Merge GUI. Once the user merges their changes into the latest version and saves it - they'll have a new modified version which they can then submit.

E.g: (from memory, exact details may be slightly different)

)

nirali

Thanks.

Just one confusion. When user B tries to submit 1+ from workarea B, at that time version 2 is in Staging. So it will create conflict, right ?
So does TS provide option to merge the content of 1+ of workarea B with version 2 and reove the conflict ?

So when conflict is removed, only the content of version 2 from Staging will move to contents in workarea B. Contents from 1+ from workarea B will not move to Staging. So after this merge process, file in workarea B will be updated. Version in Staging will be updated only after file is submitted from workarea B.

I remember something like this but dont remember exactly what it was

Pls correct, if this is wrong.

Adam Stoller

Thanks.

Just one confusion. When user B tries to submit 1+ from workarea B, at that time version 2 is in Staging. So it will create conflict, right ?

Correct

So does TS provide option to merge the content of 1+ of workarea B with version 2 and remove the conflict ?

Yes - the Diff/Merge GUI. TeamSite does not provide an auto-merge facility (like what you might see in some SCM systems) it is all manually performed via the Diff/Merge GUI.

So when conflict is removed, only the content of version 2 from Staging will move to contents in workarea B. Contents from 1+ from workarea B will not move to Staging.

Yes/no - Conflict can be removed in Workarea-B by overriding it with the contents from staging (version-2) or merging it with the contents from staging (becoming version 2+). The resolution does not automatically imply that the resolved copy is placed into staging, that still has to happen (to create version 3).

So after this merge process, file in workarea B will be updated. Version in Staging will be updated only after file is submitted from workarea B.

Correct

Migrateduser

Here I would like to advise the get latest option if user has to work in its own workarea...

I also prfere using one WA per branch...