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,362,540
Community Members
 
Community Events
168
Community Groups

"Resolve using theirs/mine" on a binary file launches external diff tool

Hello! I'm unable to solve a conflict on a binary file because when i choose "Resolve using theirs/mine" Sourcetree launches external diff tool (DiffMerge in my case) which says that it "Cannot Import File into Unicode!"

 

What should I do? Is it something in my settings or is it a bug??

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events