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
4,361,127
Community Members
 
Community Events
168
Community Groups

Source tree feature improvement request when resolving conflicts.

Hello, not sure where to post this feature request. I am a SourceTree user and one thing that I constantly hit is that most of the SourceTree users I know are confused by the 'Resolve using mine' and 'Resolve using their' buttons when trying to resolve a merge conflict. Mainly because they don't really know what is mine and what is their.

A simple fix to this would be to just add the branch_name in the button title. 'Resolve using develop_local changes'

'Resolve using develop_remote changes'

OR

'Resolve using feature_branch changes'

'Resolve using develop changes'

 

This simple change would make life easier to a lot of SourceTree users out there, since at the time you are resolving conflicts you know what branch are you trying to merge into what branch.

0 comments

Comment

Log in or Sign up to comment
TAGS
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...

79,113 views 135 29
Read article

Atlassian Community Events