git Merge ERROR 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