You can see Git repository information directly in the Explorer tab of the Workspace Manager. This opens the Git blame log for the file in a separate window. This allows you to view the conflicts but not actually merge them. This will open a read-only compare of the local and remote versions of the conflict file. Using this option will automatically and permanently resolve conflicts for the file without any user interaction. This option allows you to quickly accept all changes from the local or remote branch for the active file. You can use the Open button to open a folder anywhere on the file system that contains Git conflicts.įor the selected conflict file, UltraCompare provides the following options:
#ULTRACOMPARE SAVE ACTIVATION FULL#
The “Folder” field shows the full path to the folder on the local file system. The Conflicts window includes a list of all files containing Git merge conflicts within the active repository (see Repositories window section). You can toggle the visibility of the Conflicts window in the new “Git” group in the Layout ribbon. This forces UltraCompare to check the status of the repository / branch and updates the file listing in the Branch browser. See the Resolving Git merge conflicts section. This opens a new Git resolve conflicts with the selected file. Resolve conflicts… (only shown for files with conflicts).This will sort files in the tree view by their Git status, (modified, then conflicts, then up-to-date). Sort files by Git status (only shown for root folder and branch).The context menu in the Branch browser offers the following options: With this enabled, clicking a file in the branch browser will open a read-only compare of the working copy of the file against the repository version, so you can see what uncommitted changes are in the file. The Review mode checkbox at the top of the branch browser allows you to toggle a special “Git review” session. A red overlay indicates that the file contains merge conflicts that must be manually resolved before it can be staged and committed to the repository.An orange overlay indicates that the files has changes that are not yet in the repository.A green overlay indicates that the file is up-to-date with the repository.You can explore the files within the repository’s working directory, as well as see the Git status of individual files via the Git icon overlays. The Branch browser window provides you with a tree-style file listing of the active repository and branch. You can toggle the visibility of the Branch browser window in the new “Git” group in the Layout ribbon. You can easily checkout a different branch by double-clicking on it.
The list of remote branches is collapsed by default.
#ULTRACOMPARE SAVE ACTIVATION WINDOWS#
See the Comparing versions of a file in a Git repository section below for further details.Ĭlicking this option opens the Git repository folder in Windows explorer.Īdditionally, a list of all local and remote branches are shown underneath the selected repository, with the active branch shown in bold.
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)
