Merge Buttons shifting positions

Question

The VS2010 confilct reslution contains buttons with different alternatives depending on type of conflict:

Example:

Button positions left to right in different siruations

Alt 1.

"Keep Target" "Take Source"

Alt 2.

"Restore File and AutoMerge" "Keep Target" "Take Source"

What is annoying is that if you intend to "Take Source" for a number of files repeatedly, one-by-one, then you may encounter that suddenly the "Take Source" button was shifted to the left and you end up with your cursor being placed over the "Keep Target" button and in 9 cases out of 10 you have clicked the mouse before you see it.

Any plan to change this behaviour (the way the buttons are positioned) in a future release?

Yes I know you can do a multiple select in the list of conlicting items and then press the button once, but sometimes you may want to do it one-by-one.

Thanks,
GT  

Answer 1

I agree with you that this is a downside of the current approach of having dynamic buttons for each conflict. You've already mentioned one potential workaround which is to use a multiselection to apply a single resolution to a group of conflicts simultaneously. If you want to resolve them one by one then another alternative would be to use keyboard shortcuts to select your resolution on each item. These shortcuts are static, so they should be more reliable for you. I hope this helps.

Answer 2

So it was by design and not by mistake. This is bad and may lead to serious merge mistakes, but I guess we will have to live with it.
Of course you can learn to live with workaround but the point is that you don't start to use them until you have done mistake caused by the non intuitive GUI.

Thanks

Answer 3

Hi GT,

Thanks for your post.

Sorry for any inconvenience, yes, that’s by designed. 

For this scenario, you can submit it as a suggestion to User Voice site at: http://visualstudio.uservoice.com/forums/121579-visual-studio. Microsoft engineers will evaluate them seriously.

---

John Qiao [MSFT]
MSDN Community Support | Feedback to us

Answer 4

Done!

User Voice item:

"Implement fixed positions on merge buttons in TFS2010"

Thanks