after pulling (with update option) there are unwanted comments in my files

SourceTree Version 1.6.13.0

after pull as (update)

if any files have changes the SourceTree will comment with each change with something like comments

Please any help ?

Example:

=======================

 int var =15;

>>>>>Working Copy

=======================

int var = 20;

>>>>>> comment

===================

1 answer

This looks like you have a merge conflict that you need to resolve. (Or somebody committed a file marked with the merge conflict markers.) If you do not have a merge conflict, check the file's history to see who committed the strange lines and talk to them.

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

273 views 0 3
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot