HomeGUI clientResolve ToolWhen will the Resolve Tool appear?

4.2. When will the Resolve Tool appear?

The Resolve Tool can appear when you are:

You can determine when the Resolve Tool will appear with the 'Options | Integration' flags.

If the 'Automatically Integrate Pending Changesets' option is not checked then the Resolve Tool will always appear in the above situations.

If the 'Automatically Merge Non-Conflicting Edits' option is not checked then the Resolve Tool will always appear in the above situations if you are editing a file in the workspace which is being changed within the changeset/shelveset you are integrating.

If both these options are checked then the Resolve Tool will only appear if you have changed the same line within a file which has also been changed within the changeset/shelveset you are integrating.

This page was: Helpful | Not Helpful