Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

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.

Get started Tell me more
Atlassian Community about banner
4,554,391
Community Members
 
Community Events
184
Community Groups

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

Piotr
Piotr Feb 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...

Answer
Watch
Like Be the first to like this
375 views

1 answer

0 votes
minnsey
minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
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.

Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

See all events