See Resolving Git merge conflicts section.Ĭlicking this option creates a new Git file version compare session where you can select a file to compare from the active repository. This option is only available if the selected repository’s working directory contains at least one file in a conflict state. When selected, the repository is highlighted and shown with the following options:Ĭlicking this option activates the Conflicts window, which includes a list of files in a conflict state for the active repository. The selected repository within the Repositories pane is considered the active repository. A red icon, with an asterisk (*) next to the repository name, indicates that the repository’s working directory contains at least one file that is in a conflict state as a result of a previous Git merge.An orange icon indicates that the repository’s working directory has at least one uncommitted change.A green icon indicates that the repository’s working directory has no uncommitted changes.
The repositories are shown with a Git icon in one of three possible states: You can also manually add or remove locations to be ignored for Git repository scanning in Settings » Git integration by clicking the Exclude folders… button. You can remove a repository from the Repositories list by right-clicking on it and selecting “Hide”. If you have Git repositories on other drives (for example, a USB drive or a network share) that UltraCompare doesn’t detect, you can add them by clicking the + button at the top-right of this window. On first run, UltraCompare will scan all attached local / internal storage drives for Git repositories and show them here. The Repositories window is a list of all Git repositories UltraCompare has detected on your system, as well as all local and remote branches for the active / selected repository. You can toggle the visibility of the Repositories window in the new “Git” group in the Layout ribbon.
0 kommentar(er)
