The "Merge conflict" page is initially shown without the list of commits. (Presumably because that data is loaded asynchronously.) The "Merge" and "Merge in external merger" buttons are immediately visible. When the commits are listed the buttons move down to make room for the list of commits.
If the user has aimed for one of the buttons and intends to click it, moving the buttons at that very moment can result in one of
a) reaiming (which is annoying)
b) a missed click (not good)
c) clicking the wrong button (very irritating)
Merge conflicts are plenty and the time between selecting a file and wanting to merge it is very short. That means that this problem happens a bit too often.
Workaround: Using keyboard (Ctrl+D for external merger) works better but is not ideal for left handed mouse users.
Suggested solution: Place the merge buttons steadily between the two lists under the two ckeckboxes. In English "Merge in external merger" is a bit too long and would have to be line wrapped. Or just place them above.
The "Merge conflict" page is initially shown without the list of commits. (Presumably because that data is loaded asynchronously.) The "Merge" and "Merge in external merger" buttons are immediately visible. When the commits are listed the buttons move down to make room for the list of commits.
If the user has aimed for one of the buttons and intends to click it, moving the buttons at that very moment can result in one of a) reaiming (which is annoying) b) a missed click (not good) c) clicking the wrong button (very irritating)
Merge conflicts are plenty and the time between selecting a file and wanting to merge it is very short. That means that this problem happens a bit too often.
Workaround: Using keyboard (Ctrl+D for external merger) works better but is not ideal for left handed mouse users.
Suggested solution: Place the merge buttons steadily between the two lists under the two ckeckboxes. In English "Merge in external merger" is a bit too long and would have to be line wrapped. Or just place them above.