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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

387 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