Sourcetree merge - change log.

I am facing an issue with SourceTree (on Windows) merge. In the Log/History tab, I am able to see the two parents that were used in the merge. But the Log/History tab shows only the files that were affected by one parent. How can I see the files that were changed by the second parent in the merge? Am I missing something here?

1 answer

There is an option at tools\options\git\"show file changes from all sides of a merge". This will change the way the diff is displayed.

where does this option exist on SourceTree for Mac?

 

I don't see this option on Mac too. I am using SourceTree 2.6.3

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

568 views 1 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you