VS2015 git An error occurred. Detailed message: 1 conflict prevents checkout
By Gilbert Rath at Apr 02 2020