Community Tip - Visit the PTCooler (the community lounge) to get to know your fellow community members and check out some of Dale's Friday Humor posts! X
Hello everyone,
suppose to have this scenario:
Now the question is:
If there are no conflict Integrity perform an automatic merge (as GIT do) highlighting the difference by compare the content?
I take for granted that conflicts must be resolve manually.
Thank you !
Solved! Go to Solution.
The default settings are that the first developer will be prompted to resynchronize to member revision, merging as needed:
If they choose to resynchronize and merge, they will be prompted to choose the type of merge:
If they choose Automatic and there are conflicts, they will then be prompted to launch the conflict resolution tool.
You can change the defaults in the user preferences. Select File > Preferences. Expand Configuration Management then Commands. The Check In and Merge commands are the ones to change. If you want everything as automatic as possible, then choose On Newer Revision: Resychronize for the Check In preference, and Merge Type: Automatic.
The default settings are that the first developer will be prompted to resynchronize to member revision, merging as needed:
If they choose to resynchronize and merge, they will be prompted to choose the type of merge:
If they choose Automatic and there are conflicts, they will then be prompted to launch the conflict resolution tool.
You can change the defaults in the user preferences. Select File > Preferences. Expand Configuration Management then Commands. The Check In and Merge commands are the ones to change. If you want everything as automatic as possible, then choose On Newer Revision: Resychronize for the Check In preference, and Merge Type: Automatic.
One more thing: After the merge is done, whether automatic or manual, the Check In is marked as Deferred. The user must select Member > Submit Deferred or submit the change package to complete the Check In.