多种方法解决Please specify which branch you want to merge with的错误