Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Notification during Pull conflict

I have just now configured Sourcetree and using bitbucket with Sourcetree.

Had pointed to git folder for initial setup of sourcetree. Not enabled Mercurial setup.

Now when i have pulled code from Bitbucket i get a conflict and i do not see any message that there is a conflict and on which file the conflict is.

Manually i need to search the file and check if there is conflict.

IS that the sourcetree donot have the Notification feature to let the user know that there is a conflict and on which file the conflict is.

1 answer

0 votes
minnsey Atlassian Team Jun 20, 2018

Hi

Can you provide a screen shot? 

If there is a conflict after a pull/merge etc Sourcetree should inform you and the conflicted files should be clearly listed in the File Status view.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published 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...

5,745 views 4 12
Read article

Community Events

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

Events near you