error: 'commit' is not possible because you have unmerged files. 解决方案: 1.把修改的文件add下,如:git add bidder_mod/src/common/dragon_bidder_data.cc2.git commit