You deliver the changes in your work area to a stream in a repository using the Deliver operation. When there are conflicts between a work area and a stream, first perform an update to resolve the conflicts locally and then try delivering again.
NOTE Deliver is a lock-free operation: if two developers deliver different files at the same time both deliveries will succeed.
Related Topics