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

Source and Merge Tags

Mevan

While reconciling the files, sometimes the differences window opens with "'Visual','Source','Tags' and 'Properties'" tags.
But sometimes, it opens with "'Visual','Merge','Tags' and 'Properties'" tags. I am confuesd on this behaviour. Can someone suggest me ideas?

Thank you!

Find more posts tagged with

Comments

Adam Stoller

While reconciling the files, sometimes the differences window opens with "'Visual','Source','Tags' and 'Properties'" tags.
But sometimes, it opens with "'Visual','Merge','Tags' and 'Properties'" tags. I am confuesd on this behaviour. Can someone suggest me ideas?

Thank you!

Merge appears when you are performing a Submit operation and there is a conflict between the version you are trying to submit and the version that is currently in the staging area (this generally will only happen if you have more than one workarea on the branch).

Source (or "Source Diff" in real terminology) will appear when you are doing a comparison operation (e.g.: not a Submit)

Mevan

We have a customised code, which reconciles the files, if they are not already done. When a file is selected and reconciled, for some files, it opens up with Source tag, showing just the differences between the file in Staging and in Workarea and for some files, it opens with Merge tag, showing the difference as well as Merge utility. I could not figure out why this is happening.

Adam Stoller

We have a customised code, which reconciles the files, if they are not already done. When a file is selected and reconciled, for some files, it opens up with Source tag, showing just the differences between the file in Staging and in Workarea and for some files, it opens with Merge tag, showing the difference as well as Merge utility. I could not figure out why this is happening.

Because your reconciliation is not being interpreted as such by TeamSite, which still sees a need to perform merging.
Essentially, you need to do the following steps to simulate the synchronizing:

If TeamSite doesn't recognize the base-version of the file in the workarea as being the same as version in staging it will assume a conflict and require a merge.

Mevan

Thanks for your help. I have a question here.

If TeamSite doesn't recognize the base-version of the file in the workarea as being the same as version in staging it will assume a conflict and require a merge.

According to the above statement, Teamsite must request to merge, whenever there is a conflict in a file between workarea and stating. But I also see some files, where there is conflict, but Teamsite doesn't propmt to merge. How does Teamsite identify which files to merge and which files not to merge with any file that has conflicts?

Thanks.

Adam Stoller

Thanks for your help. I have a question here.

According to the above statement, Teamsite must request to merge, whenever there is a conflict in a file between workarea and stating. But I also see some files, where there is conflict, but Teamsite doesn't propmt to merge. How does Teamsite identify which files to merge and which files not to merge with any file that has conflicts?

Thanks.

Are you sure there's a conflict?

If the version in staging is '7' and the version in the workarea is '7+' there is no conflict - no matter how much the two files differ.

If the version in staging is '7' and the version in the workarea is '6+' there should be a conflict - no matter how much the two files are alike (even identical)

If you find some other situation to cause / not cause a merge situation (for submitting, iwupdate processes would be similar but might vary a bit) - please post the details of replicating it.

Mevan

Hi,
Even I was in the same idea about versions and merging. But this is not working in that way. Or may be I am wrong.
Details for replication:
1. Select a file in the workarea and go to "Actions" menu and select "Compare To".
2. Browse to the "Staging" path in the Area field.
3. Click the file differences icon, which appears in between the two files.
Now, no matter what the version is, either same or different, for some files,it opens the differences window with "view,source,tags,properties" tabs and for some files with "view,merge,tags,properties" tabs.
The only difference I can find between the files which opens source and which opens merge is, the "Archived In" property.In the properties tab, for the file which opens source tab, there is an entry for both workarea and staging, as below.

Location --> /default/main/Home/4Q09/WORKAREA/DHome_3Q09/Properties/FormsLit
--> /default/main/Home/4Q09/STAGING/Properties/FormsLit
Archived In --> /default/main/Home/4Q09/EDITION/#36
--> /default/main/Home/4Q09/EDITION/#54

But Where the file opens a differnces wondow with Merge tab, it doesn't have an entry for the workarea "Archived In" property but it has entry for the property in staging. I am not sure if this is the cause, or something else.

Thank you.