You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
I have been using Sourcetree several years now, but recently I have encountered a new problem with using Beyond Compare as the diff tool.
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.
But the current commit version would show in the correct path in the repository. For example, C:\development\repository\requestHandler.cfc
However, recently it has started opening both the current file and the earlier version in temp directories
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.
This effectively stops me being able to use Beyond Compare to resolve merge conflicts anymore.
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.
I have tried googling this and not found any answers so far.
I have tried some of the more obvious things:
- making sure my version of source tree is up to date (I am now on 3.3.8).
-setting the diff tools option back to default, then resetting to Beyond Compare,
but none of this has made any difference.
Has anyone else had and resolved this issue?
I have added screen shots of:
the diff options in tools / options,
showing how I select the diff tool on a file with the current commit and earlier commit on the same branch
showing beyond compare with the different file versions both showing in temp folders rather than one in the correct repository path as expected.
We managed to solve this in the end.
It was both quite simple and quite messy.
It was simple in the fact that somewhere along the line, my version of Git had gotten updated. (I was on the embedded version of Git).
So, the short version of the story, I got rid of any versions of git on my machine and rolled back to git version 2.14.3 and then set Sourcetree to use this.
This is because we eventually found a blog post suggesting the temp folder issue had appeared sometime after 2.14.3 of Git.
It was messy in as much as it took a long time to figure this out and several uninstalls / reinstall of git and sourcetree before it eventually seemed to realise that it was using the new (older) version of Git.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.