11/21/2023 0 Comments Sourcetree merge tool not opening![]() I tried changing the External Diff option to Custom and manually selecting the DiffMerge executable (C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe), with or without quotes, and passing the $LOCAL and $REMOTE as the parameters in the Arguments field in SourceTree (with quotes and with backslash-escaped quotes). (SourceTree on my computer is already allowed to modify the global git config.) This is highly counter-intuitive because opening a terminal from Sourcetree and running git from the command line. it seems that Sourcetree does not use the global git config at C. I looked at this Atlassian Community question, but it really seems to be about a different issue. git config -global merge.tool examdiff git mergetool -toolexamdiff See commit 35d62bb, commit e36d716. SourceTree is configured to use DiffMerge as the External Diff Tool and as the Merge Tool. "C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe" local.env I can open DiffMerge directly, even from the command line. I'm using Windows 10, SourceTree version 2.4.8.0 (latest, last I checked), and Source Gear's DiffMerge tool (version 4.2.0, which is probably old). Has anyone else seen this as well and/or does anyone have any pointers for how I might fix it? ![]() I see the 'Visual Merge In Progress' message briefly and I can see in SourceTree that the temp files (the ones suffixed BACKUP, BASE, and LOCAL) are created, but soon after the message goes away and the temp files disappear. Showing beyond compare with the different file versions both showing in temp folders rather than one in the correct repository path as expected.Within the last week or two, SourceTree lost the ability to open the "External diff" tool: when I select External diff (or hit Ctrl-D), it no longer opens the external diff tool. When merging, I right-click on a file with a merge conflict and choose Resolve Conflicts > Launch External Merge Tool. Showing how I select the diff tool on a file with the current commit and earlier commit on the same branch This page is powered by a knowledgeable community that helps you make an informed decision. ![]() 'Free and open source' is the primary reason people pick Meld over the competition. Has anyone else had and resolved this issue? Meld, P4Merge, and Beyond Compare are probably your best bets out of the 13 options considered. setting the diff tools option back to default, then resetting to Beyond Compare,īut none of this has made any difference. ![]() making sure my version of source tree is up to date (I am now on 3.3.8). I have tried some of the more obvious things: I have tried googling this and not found any answers so far. I am not sure why this has changed and why it suddenly seems to be opening the current file on the current branch as if it needs to be in a temp directory. This effectively stops me being able to use Beyond Compare to resolve merge conflicts anymore. Fixed Sourcetree closing on cancelling the checking out branch from browser Fixed clone tab not selecting default branch when it isnt master Fixed Sourcetree crashing if launched by a non-admin while another user is running PAgent Fixed Git LFS prompt showing up everytime on opening a repo Fixed merge conflict not resolving on deleting. This means that I am unable to make changes to the current file via beyond compare, as it is not showing me the current file, but rather a copy in a temp directory. However, recently it has started opening both the current file and the earlier version in temp directoriesĬ:\Users\Peter\AppData\Local\Temp\cjovMc_requestHandler.cfcĬ:\Users\Peter\AppData\Local\Temp\Mxm5Gc_requestHandler.cfc For example, C:\development\repository\requestHandler.cfc Up until recently, when I compare a file in the latest commit on the currently active branch with an earlier commit on the same branch, the earlier commit file would show in source tree in a temp directory, such as C:\Users\Peter\AppData\Local\Temp\Mxm5Gc_requestHandler.cfc.īut the current commit version would show in the correct path in the repository. I have been using Sourcetree several years now, but recently I have encountered a new problem with using Beyond Compare as the diff tool.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |