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.
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.