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 Sign up to answer
Community showcase
Published 3 hours ago 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...

40 views 0 1
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