Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

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


1 badge earned


Participate in fun challenges

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


Gift kudos to your peers

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


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!


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
Community Members
Community Events
Community Groups

Show all changes in file when merge branches

How can we see all differences in file when we merge two branches?

e.g: we have 3 branches


-branch1 (from master)

-branch2 (from master)

we start work on repository following the next steps:

1 - we modify, commit and push to branch1 the file "function.sql" at line 1

2 - we modify, commit and push to branch2 the file "function.sql" at line 20

3 - we merge branch1 to master (no conflicts).

4 - we merge branch2 to master (no conflicts).

After 4 steps we have master with the changes made in branch1 and branch2, sourcetree merge automatically with no conflicts the file "function.sql".

Is posible force to SourceTree to advice us that file "function.sql" was modified in branch2 when merge branch2 to master?  



1 answer

0 votes
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Mar 19, 2019


I'm afraid I don't think you can do what you want to in Sourcetree, there are ways you can do it from the command line, see

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events