A conflict
- Rename Watch a stock use case as Keep track of a stock
- Click Commit from the toolbar
- Rename Watch a stock use case as Monitor a stock in another teamwork client
- Click Commit from the toolbar
- Click OK in Commit dialog box and then Conflict(s) found dialog box pops out
- Click OK in Conflict(s) found dialog box
Resolving conflict
- Click Overwrite button in Commit dialog box
- Click Reset button and then click Revert button
- Click OK in Commit dialog box