Bug:When collision accurs, choose "use my version" to resolve the collision went wrong

[YYX]

when collision accurs, usually i choose "use my version" or "use other's version" to resolve the collision, but i found that no matter which one i choose, it's always do the "use other's version". it's serious! this problem has been exist for a long time, hope a quick resolve. thanks a lot~

[bgannin]

What OS and what version of SourceTree are you using?

[YYX]

thanks a lot for your reply~

this issue boring me for a long time.

it's only on windows, and from version 1.9 to the newest version~