I'm using SourceTree 1.5.6.
What is the expected behavior? I was expecting a changeset of my local master branch versus the remote branch. Ultimately I'd like to open that diff externally.. using FileMerge.
If I'm going about this the wrong way, is there a better way to diff a feature branch against master?
Just as a quick note to start, if you're using the App Store (as I notice you're using 1.5.6) then we no longer publish to the App Store. You can get SourceTree direct from http://www.sourcetreeapp.com/
As for your problem, "Diff against current" basically selects two points in the log view to show the difference between those two branches. Here's a quick example I took:
I said "Diff against current" from master, and current is develop. So it just selects the head commit between the two branches, rather than giving you a diff between two different points. If you want to see the changes between revisions of a file you can use "Blame selected" option when command clicking on a file, and you can see the entire history in a log view of a particular file by right clicking and hitting "Log selected".
Hope that helps, if not, feel free to ask more questions
Kieran-- thank you much for the quick response.
I switched to 1.6.0. All other factors remain the same.
It turns out that it wasn't (just) me-- version 1.5.6 didn't show a diff, but 1.6.0 behaves like you describe. Specifically it seems to execute the equivilent of:
git difftool master origin/<feature-branch>
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs