It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,935 views 0 12
Read article

Community Events

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

Events near you