When viewing a merge commit in Source Tree, it shows me the diff to the "primary" parent.
How can I view the diff to the "secondary" parent?
I can do it in TortoiseGit, but I can't find out how to do it in Source Tree...
There is an option "Show file changes from all sides of a merge" under "Options" > "Git", but that one will show both diffs together, which is unhelpful.
Is it possible to see the diff to the one parent and the other, separately?
Here is how the UI of TortoiseGit does it:
sample of diff to two parents.png
Turns out this is very simple but not obvious. You just need to select both the merge commit and the parent you wish to diff against (using Ctrl/Cmd+click).
What is unfortunately missing from SourceTree is git's default behaviour for "git show <merge-commit>", which is to omit files that agree with either of the parents. This is a really good way of looking at merge commits that isn't currently available in SourceTree.
This is a useful work-around. But it's not practical and it allows for a relatively high chance of human error.
First I would need to navigate a complex commit tree looking for the parent commit.
I might confuse the branches (the different colours help, but are not bulletproof).
Or I might miss the commit and find the grandparent-2 instead of the parent-2.
Then I would need to manually check the diff, for each of the merges; instead of simply clicking the merge's node to see the diff. This is cumbersome, if I want to inspect more than just that particular merge-commit.
And then, if I want to continue inspecting the tree, I need to navigate back to the merge commit to continue.
All these actions are relatively easy with a simple tree... but not really practical on a repository with more than half a dozen contributors.
See the attached image for a sample of the complexity of the repository:
complex repository tree.PNG
I am also attaching an image to the question with an example of an application that shows the diff to the two parents.
Do you see why I find that option much more practical, straightforward, and less error-prone?
That option only affects the selected file.
It doesn't change the list of files.
So, if I merge e.g. the feature branch "add print version to reports page" (parent 2) into the branch development (parent 1):
Does this make sense?
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events