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

您可以选择一种方式赞助本站

发表评论

:?: :razz: :sad: :evil: :!: :smile: :oops: :grin: :eek: :shock: :???: :cool: :lol: :mad: :twisted: :roll: :wink: :idea: :arrow: :neutral: :cry: :mrgreen: