Merge requirements and task completion

A merge is required only if your team requires it. Check with your project lead, build manager, or CM administrator to find out what your default setting is for parallel versions when completing a task.

About this task

If your team does not require a merge and you are the first developer owning a parallel version to check in a parallel, then you might or might not need to merge later. (You can only merge checked-in versions. If there is only one other parallel version and it is in the working state, then the other developer will need to merge his changes with yours when he completes his task. If the parallel version is checked in, then you can either merge now or later. If there are two or more versions, then you might need to merge a parallel version later. This depends on the state of the other versions.)

If your team does not require a merge and you are not the last developer owning a parallel version to check in a parallel, then you can opt to merge later.

One helpful way to remember that you have a parallel version that needs to be merged is to start the History dialog box for the version you need to merge. This lets you watch your version and the state of the other parallels.


Feedback