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

[Mahmoud Ahmed]

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

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

[Balázs Szakmáry]

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.