Git Error: Unmerged path path/file.php, cannot checkout or pull
Solution: reset, then checkout
git reset path/file.php
git checkout path/file.php
Git Error: Unmerged path path/file.php, cannot checkout or pull
Solution: reset, then checkout
git reset path/file.php
git checkout path/file.php
Error message from git:
git fatal: index file smaller than expected
Cause: Index files are corrupted.
Solution: Remove and rebuild the index:
rm .git/index
git add .
git reset HEAD
Delete local branch:
git branch -D [branchname]
Delete remote branch:
git branch -rd origin/[branchname]
git update-index –assume-unchanged [file]
To undo:
git update-index –no-assume-unchanged [file]