Description of the illustration conflict-types-express.png

This image shows a combined image of the Conflicts section listing files with conflicts as follows:

On the left, the Readme.md file’s right-click menu shows the following options: Open in conflict editor, Open in default editor, Resolve, and Delete.

On the right, the icon.png file’s right-click menu shows the following options: Delete file and Keep file.