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?
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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