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

Getting weird output on merge conflict

I've dealt with merge conflicts on command-line, GitHub for Windows, and Git Extensions, but not in SourceTree (and I'm using it for Mac now), and I can't tell if what I'm looking at is a bug or something else.

The first character on each line in "Hunk 2" are showing in green in the same column as the plus symbol (+)... I'm having trouble merging or fixing a conflict, so I reverted and looked at one of the commits having a conflict, and the changes made (deletions) show in red but then the first character of each line also show in the same column as the minus symbol (-) in red. I'm not making sense of this.

Do I need to reinstall SourceTree or is this a bug or what?

Screen Shot 2018-06-28 at 8.36.37 AM.png

1 answer

0 votes
Manju Atlassian Team Jun 28, 2018

That seems like an odd bug. Can you please submit a ticket with the patch for us to load the same diff to locally reproduce on ?


I can't give you proprietary company source code, but I could type up a fake Lasso script file as easily as you could to reproduce the results.

Do you want to try before requesting that I do it? You probably only need a few lines.

Suggest an answer

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

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

62,287 views 127 27
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