Resolve Conflicts Dialog Box
This dialog box allows you to import scripts or resources from a Git repository.
This dialog box will also open automatically if you attempt to perform a Pull operation for files that are in conflict.
You set a merge tool from the Options Dialog Box (Tools > Options > Scripting > Comparison). Double click an entry to open it in the merge tool.
User interface elements are described below:
A list of User and Internal files that are in conflict.
Double-click on a file to open a merge tool that will allow you to resolve the conflict. For details about setting up a merge tool, see above.
|Mark as Resolved||
Marks the files whose check boxes are selected, as resolved.
To mark all files as resolved, choose Select all files.