Description of resolving conflicts 6 illustration

This figure shows the Commit dialog, where all changes are committed after resolving conflicts.