Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
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

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,461,694
Community Members
 
Community Events
176
Community Groups

compare branch to master

how can i compare two branches. lets say my working dev-branch to master or master to origin/master.

i can do this with git command line but how can this be done with sourctree. is it possible to have this in also an external diff tool? filemerge can handle a "directory diff".

i sometimes want to have the external diff to view the complete file and not only the "differences"

 

markus

2 answers

4 votes

Use control-click or command-click to select any two commits (so both are highlighted at the same time)

The window in the lower left shows you a list of all files that were different (added, deleted, or modified)

You can select a file from that list to see the specific changes in that file between the two selected commits.source_tree_diff.png

You can also configure a third party diff tool, but the built-in functionality has met my needs so I don't have any experience with that.

 

Hmmm, I know this is really stale, but I just started using souretree.  This shows how to compare two commits, but the OP asked for difference in branches.  How do you know which commits to click on?

1 vote

You can select 2 commits (cmd click) and compare in sourcetree. to compare 2 branches select the tip of the branches in log view , you can do the same for local and origin too.

 

But I usually use terminal since it is easier .

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events