Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

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

1 answer

0 votes
minnsey Atlassian Team Mar 19, 2019

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

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,266 views 4 5
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you