Show all changes in file when merge branches

[Gabriel Dominguez Cisternes]

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

e.g: we have 3 branches

-master

-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?  

Thanks,

Gabriel.

[minnsey]

Hi

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 https://stackoverflow.com/questions/10935226/git-interactive-merge