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

Notification during Pull conflict

rinoraju June 20, 2018

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
Atlassian Team members are employees working across the company in a wide variety of roles.
June 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
AUG Leaders

Atlassian Community Events