Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
Community Members
Community Events
Community Groups

Will there be a way to fix a merge conflicts within Sourcetree in any future updates?

Right now, I have to pull the conflict to my local machine via terminal, then make the changes with my editor. I am unable to pull the conflict with Sourcetree, nor edit the conflicting file(s).

0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Sourcetree

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

78,928 views 134 29
Read article

Atlassian Community Events