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

Source tree feature improvement request when resolving conflicts.

Horatiu Paraschiv
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
May 17, 2017

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
AUG Leaders

Atlassian Community Events