Description of the illustration gitpanel-conflict-filecontextmenu-resolve-express.png

This image shows the right-click menu of the Readme.md file listed under Conflicts. The Resolve option is selected to show the following options: Using your version, Using their version, and Mark as resolved.