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

Diff for staged/unstaged changes Edited

I used to use the Version 1.8 of SourceTree for a long time but recently updated to 3.1.2.

While most of the changes are nice, I noticed that the SourceTree Diff View does not distinguish between staged and unstaged changes while merging.

On normal editing hunks or lines can be staged and unstaged at will and when selecting the staged or unstaged version of the file one will see only the staged or unstaged modifications.

Today I realized this is not true while merging. When I start a merge, regardless if the staged or unstaged file is selected the full diff is shown in the diff view.

Did I miss a option or is this possibly a bug?

SourceTree 3.1.2, git 2.21.0.windows.1 (same for 2.22.0.windows.1)

1 answer

1 accepted

0 votes
Answer accepted
Mike Corsaro Atlassian Team Jun 21, 2019

Hello! This is 100% a bug (good catch!) and I will file an issue for it ASAP. It will be fixed for the next release (3.2) which should be rolled out in the next few weeks.

 

Thanks for reporting this!

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,293 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