Description of the illustration vbs-git-panel-code-conflict.png

The message Modified by both you and them, indicating the type of conflict in the file.
Two Use your version and Use their version links, used to resolve the conflict.
The message 1 unresolved conflict, indicating the number of conflicts in the file.
The Go to previous conflict and Go to next conflict icons, used to navigate conflicts in the file.
The Discard Changes button to undo all changes.
The Resolve and Close button to mark the file once all conflicts are resolved.
The lines between «««< and ======= show code from the remote branch and have this identifier: Upstream, based on branch ‘mybranch’ of https//ipaddress/s/projectname/scm/myrepo.git. The left edge of this content has a yellow circle as a conflict marker, which you can select to use their version.
The lines between ======= and »»»> show code from the local branch and have this identifier: e363ca0 updated title, icon, and readme. The left edge of this content has a red circle as a conflict marker, which you can select to use your version.
Between these two sets of content is a gray circle conflict marker, which you can select to use both versions.

The left edge of this content has a yellow circle as a conflict marker, which you can select to use their version.

The left edge of this content has a red circle as a conflict marker, which you can select to use your version.