This might be a repeated question but i didn\'t find exact answers. Lets say i have 2 branches br1 and br2 with 3 commits each.
I\'d like to disable the automatic merge feature when checking in a file to TFS that another developer has worked on so that I a开发者_如何学Golways need to merge manually. Is there any way to do this