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

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

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!
February 22, 2020

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

Atlassian Community Events