git membatalkan simpanan konflik

git reset HEAD .
Copperfield