Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

merge commit: How to see "combined diff" - code changed in merge commit / conflict resolution

Piotr February 20, 2019

Hi,

I want to see what "extra" changes were done in merge commit.  In command line it can be done with "git show" which produces "combined diff", as described e.g. here: https://stackoverflow.com/questions/45253550/how-to-check-if-a-merge-commit-contains-manual-changes-e-g-resolved-conflicts

In tortoisegit I can right click on merge commit and select "Unified diff with > show extra changes after merge".

Is something similar possible in SourceTree directly? Could not find anything...

1 answer

0 votes
minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
February 27, 2019

Hi

I'm afraid I don't think you can do that currently in Sourcetree, the only place we use git show the command you refer to in a place where you might see that information is in the interactive rebase dialogs.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events