git checkout .
error: path 'Hoge/hogehoge' is unmerged
が出たら
git reset --hard
で変更を消す.
More than 5 years have passed since last update.
Register as a new user and use Qiita more conveniently
- You get articles that match your needs
- You can efficiently read back useful information
- You can use dark theme