When you use batch mode to resolve conflicts, all conflicts are resolved in the same manner. For example, if you select the option to update the work area from the database, all work area files are updated with files from the database.
The possible batch mode results are summarized in the following table.
Conflict type | Result: Update database from work area batch mode | Result: Update work area from database batch mode |
---|---|---|
1. Work area change to working object | Database object updated with changes from work area | Work area file updated with file from database |
2. Database change to working object | Database object updated with changes from work area | Work area file updated with file from database |
3. Work area change to static object | Database object checked out and then updated with changes from work area | Work area file updated with file from database |
4. Database change to static object | Database object checked out and then updated with changes from work area | Work area file updated with file from database |
5. Object changed in multiple locations | Database object checked out and then updated with changes from work area | Work area file updated with file from database |
6. Files missing from work area | Database objects not found in work area removed in project | Missing files copied from the database to the work area |
7. 7. Uncontrolled files | Work area files added to database and then checked out | Uncontrolled files deleted from work area |
8. Files in error | User manually resolves the conflict by deleting or renaming the file | User manually resolves the conflict by deleting or renaming the file |
For more information, see Conflict resolution: update database from work area batch mode and Conflict resolution: update work area from database batch mode.