Confusing contraddictory terminology in UI for merge
Created originally on Bitbucket by teo8976 (Teo Tei)
When you right click on, for example, the tip of a branch which is not the current one and do "Merge with local", you get a dialog like the one in the attached screenshot.
The terminology used is confusing and contraddicts itself.
It says
Merge from (other)
Merge to (working directory)
and then there is a checkbox:
discard all changes from merge target (other) revision
If you say "merge from A to B", one is inclined to think that the word target refers to B, because by definition when you do something from A to B, B is the target. However, here "merge target" refers to A, which one can tell thanks to the term "other" (which would be pretty ambiguous by itself) which is used to identify it.
The use of the word "other" in the two places resolves the ambiguity, but the terminology used remains intrinsically contraddictory.
Attachments: Screenshot_from_2016-01-12_18_07_07