Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,359,957
Community Members
 
Community Events
168
Community Groups

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

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 Feb 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
Community showcase
Published in Sourcetree

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

78,687 views 134 29
Read article

Atlassian Community Events