git合并错误 error: path ‘config/db.php’ is unmerged $ git checkout config/db.php error: path 'config/db.php' is unmerged $ git reset foo/bar.txt $ git checkout foo/bar.txt 来源：oschina链接：https://my.oschina.net/u/2669637/blog/3010415 标签 PHP Error php git
