![]() 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: 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. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |